mercurial/hg.py
changeset 3680 69cf255a55a1
parent 3679 2956948b81f3
child 3713 8ae88ed2a3b6
--- 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]