changeset 45382 | 0652a533fe3c |
parent 45332 | 54eeb1a0e325 |
child 45432 | f52b0297acc8 |
--- a/mercurial/commit.py Mon Aug 10 15:09:44 2020 +0530 +++ b/mercurial/commit.py Mon Aug 10 15:29:02 2020 +0530 @@ -325,10 +325,7 @@ elif not fparentancestors: # TODO: this whole if-else might be simplified much more ms = mergestate.mergestate.read(repo) - if ( - fname in ms - and ms[fname] == mergestate.MERGE_RECORD_MERGED_OTHER - ): + if ms.extras(fname).get(b'filenode-source') == b'other': fparent1, fparent2 = fparent2, nullid # is the file changed?