Merge lp:~nmb/bzr/fix-505088 into lp:bzr

[Neil Martinsen-Burrell]

[Neil Martinsen-Burrell (nmb)]

Following on another of Eli's good doc bug reports, this explains the --uncommitted option more fully in the doc text for merge.

[Vincent Ladeuil (vila)]

Please sort your NEWS entries, that avoid the conflicts as the one shown *right* now.

I'll tweak and merge.

review: Approve

=== modified file 'NEWS'
--- NEWS	2010-01-18 18:35:11 +0000
+++ NEWS	2010-01-18 21:25:26 +0000
@@ -111,9 +111,15 @@
   should appear up-to-date.)
   (John Arbash Meinel, Martin <gzlist>, #488724)
 
+<<<<<<< TREE
 * Improve discussion of pending merges in the documentation for
   ``revert``.  (Neil Martinsen-Burrell, #505093)
 
+=======
+* Better explain the --uncommitted option of merge.
+  (Neil Martinsen-Burrell, #505088)
+
+>>>>>>> MERGE-SOURCE
 Improvements
 ************
 

=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2010-01-18 18:35:11 +0000
+++ bzrlib/builtins.py	2010-01-18 21:25:26 +0000
@@ -3647,7 +3647,9 @@
     committed to record the result of the merge.
 
     merge refuses to run if there are any uncommitted changes, unless
-    --force is given.
+    --force is given.  If one would like to merge changes from the working
+    tree of the other branch without merging any committed revisions, the
+    --uncommitted option can be given.
 
     To select only some changes to merge, use "merge -i", which will prompt
     you to apply each diff hunk and file change, similar to "shelve".