Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/hg.py @ 3680:69cf255a55a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Indentation cleanups for 2956948b81f3.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 19 Nov 2006 16:09:04 +0100
parents 2956948b81f3
children 8ae88ed2a3b6
line wrap: on
line diff
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -243,7 +243,7 @@ def merge(repo, node, force=None, remind
                          " you can redo the full merge using:\n"
                          "  hg update -C %s\n"
                          "  hg merge %s\n")
-                         % (pl[0].rev(), pl[1].rev()))
+                       % (pl[0].rev(), pl[1].rev()))
     elif remind:
         repo.ui.status(_("(branch merge, don't forget to commit)\n"))
     return stats[3]