Mercurial > hg-stable

changeset 42957:2c14bf83b58b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Yuya Nishihara <yuya@tcha.org>
date Thu, 19 Sep 2019 07:50:24 +0900
parents 44be33cf7a57 (current diff) 085295f82845 (diff)
children 9668744c9122
files mercurial/merge.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Tue Sep 17 15:35:16 2019 -0700
+++ b/mercurial/merge.py	Thu Sep 19 07:50:24 2019 +0900
@@ -2257,7 +2257,7 @@
         pother = nullid
         parents = ctx.parents()
         if keepparent and len(parents) == 2 and pctx in parents:
-            if pctx == parents[0]:
+            if pctx == parents[1]:
                 potherp1 = True
             parents.remove(pctx)
             pother = parents[0].node()