Rev 4957: Tweak the spacing. in file:///home/vila/src/bzr/reviews/fix-505088/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/reviews/fix-505088/

------------------------------------------------------------
revno: 4957
revision-id: v.ladeuil+lp at free.fr-20100120125843-87nbl3vih0zosuew
parent: nmb at wartburg.edu-20100118212004-3kr19y6he525dodg
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: fix-505088
timestamp: Wed 2010-01-20 13:58:43 +0100
message:
  Tweak the spacing.
  
  * bzrlib/builtins.py:
  (cmd_merge): Use a separate paragraph for --uncommitted.
  
  * NEWS: 
  Fix entry order.
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2010-01-18 21:20:04 +0000
+++ b/NEWS	2010-01-20 12:58:43 +0000
@@ -49,6 +49,9 @@
   user-specified commit message editor.
   (Martin Pool, #504842)
 
+* Better explain the --uncommitted option of merge.
+  (Neil Martinsen-Burrell, #505088)
+
 * ``bzr export dir`` now requests all file content as a record stream,
   rather than requsting the file content one file-at-a-time. This can make
   exporting over the network significantly faster (54min => 9min in one
@@ -97,9 +100,6 @@
   should appear up-to-date.)
   (John Arbash Meinel, Martin <gzlist>, #488724)
 
-* Better explain the --uncommitted option of merge.
-  (Neil Martinsen-Burrell, #505088)
-
 Improvements
 ************
 

=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2010-01-18 21:20:04 +0000
+++ b/bzrlib/builtins.py	2010-01-20 12:58:43 +0000
@@ -3647,9 +3647,11 @@
     committed to record the result of the merge.
 
     merge refuses to run if there are any uncommitted changes, unless
-    --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.
+    --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".