Mercurial > hg

diff mercurial/merge.py @ 12401:4cdaf1adafc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backout most of 4f8067c94729
author Matt Mackall <mpm@selenic.com>
date Fri, 24 Sep 2010 12:46:54 -0500
parents 4f8067c94729
children 545ec1775021
line wrap: on
line diff
--- a/mercurial/merge.py	Fri Sep 24 12:00:55 2010 +0200
+++ b/mercurial/merge.py	Fri Sep 24 12:46:54 2010 -0500
@@ -496,7 +496,7 @@
                 raise util.Abort(_("outstanding uncommitted changes "
                                    "(use 'hg status' to list changes)"))
         elif not overwrite:
-            if pa in (p1, p2): # linear
+            if pa == p1 or pa == p2: # linear
                 pass # all good
             elif wc.files() or wc.deleted():
                 raise util.Abort(_("crosses branches (use 'hg merge' to merge "