Rev 4604: Merge cleanup into shell-like-tests in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/conflict-manager/

------------------------------------------------------------
revno: 4604 [merge]
revision-id: v.ladeuil+lp at free.fr-20090901161939-vfo19ldos17g5img
parent: v.ladeuil+lp at free.fr-20090901161659-vbwarv3g436lfbft
parent: v.ladeuil+lp at free.fr-20090901161906-s021yw4y0dght0xz
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: shell-like-tests
timestamp: Tue 2009-09-01 18:19:39 +0200
message:
  Merge cleanup into shell-like-tests
modified:
  bzrlib/conflicts.py            conflicts.py-20051001061850-78ef952ba63d2b42
-------------- next part --------------
=== modified file 'bzrlib/conflicts.py'
--- a/bzrlib/conflicts.py	2009-08-13 06:19:32 +0000
+++ b/bzrlib/conflicts.py	2009-09-01 16:19:06 +0000
@@ -150,9 +150,9 @@
 
 
 def restore(filename):
-    """\
-    Restore a conflicted file to the state it was in before merging.
-    Only text restoration supported at present.
+    """Restore a conflicted file to the state it was in before merging.
+
+    Only text restoration is supported at present.
     """
     conflicted = False
     try: