Mercurial > hg

diff mercurial/merge.py @ 12387:4f8067c94729

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: use x in (a, b) instead of x == a or x == b
author Brodie Rao <brodie@bitheap.org>
date Thu, 23 Sep 2010 00:02:31 -0500
parents 6f0d9d79111f
children 4cdaf1adafc8
line wrap: on
line diff
--- a/mercurial/merge.py	Thu Sep 23 10:59:21 2010 +0200
+++ b/mercurial/merge.py	Thu Sep 23 00:02:31 2010 -0500
@@ -496,7 +496,7 @@
                 raise util.Abort(_("outstanding uncommitted changes "
                                    "(use 'hg status' to list changes)"))
         elif not overwrite:
-            if pa == p1 or pa == p2: # linear
+            if pa in (p1, p2): # linear
                 pass # all good
             elif wc.files() or wc.deleted():
                 raise util.Abort(_("crosses branches (use 'hg merge' to merge "