facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 00:14:35 +03:00
Code Issues Projects Releases Wiki Activity

merge: remove a flags case

Browse Source
This commit is contained in:
Matt Mackall 2009-06-08 18:14:44 -05:00
parent da4ac4f699
commit 2c65849ffa
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mercurial/merge.py
View File

@ -174,10 +174,7 @@ def manifestmerge(repo, p1, p2, pa, overwrite, partial):
if partial and not partial(f):
continue
if f in m2:
if overwrite or backwards:
rflags = m2.flags(f)
else:
rflags = fmerge(f, f, f)
rflags = fmerge(f, f, f)
# are files different?
if n != m2[f]:
a = ma.get(f, nullid)