Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/simplemerge.py
changeset 16687 e34106fa0dc3
parent 16683 525fdb738975
child 21272 4aeb7a6029ba 
--- a/mercurial/simplemerge.py	Sat May 12 16:00:57 2012 +0200
+++ b/mercurial/simplemerge.py	Sat May 12 16:00:58 2012 +0200
@@ -94,7 +94,7 @@
             elif self.a[0].endswith('\r'):
                 newline = '\r'
         if base_marker and reprocess:
-            raise CantReprocessAndShowBase()
+            raise CantReprocessAndShowBase
         if name_a:
             start_marker = start_marker + ' ' + name_a
         if name_b:
Mercurial