Rev 4817: (igc) Trivial formatting fix to merge help in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4817 [merge]
revision-id: pqm at pqm.ubuntu.com-20091120064432-kq66yp5jkffi1ijo
parent: pqm at pqm.ubuntu.com-20091120050017-v09m0msompvbol5b
parent: ian.clatworthy at canonical.com-20091120055454-gyuws3wg1m09a3lu
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-11-20 06:44:32 +0000
message:
  (igc) Trivial formatting fix to merge help
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2009-11-20 04:15:18 +0000
+++ b/bzrlib/builtins.py	2009-11-20 05:54:54 +0000
@@ -3635,7 +3635,7 @@
 
             bzr merge -r 81..82 ../bzr.dev
 
-        To apply a merge directive contained in /tmp/merge:
+        To apply a merge directive contained in /tmp/merge::
 
             bzr merge /tmp/merge
     """