Mercurial > public > mercurial-scm > hg-stable

diff mercurial/simplemerge.py @ 16687:e34106fa0dc3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: "raise SomeException()" -> "raise SomeException"
author Brodie Rao <brodie@sf.io>
date Sat, 12 May 2012 16:00:58 +0200
parents 525fdb738975
children 4aeb7a6029ba
line wrap: on
line diff
--- 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: