facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 15:57:43 +03:00
Code Issues Projects Releases Wiki Activity

localrepo.commit: switch to mergestate.read()

Browse Source 
See previous patches for why we're doing this.
This commit is contained in:
Siddharth Agarwal 2015-11-17 13:58:50 -08:00
parent 178aa21f0d
commit b5cb4f4050
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mercurial/localrepo.py
View File

@ -1556,7 +1556,7 @@ class localrepository(object):
raise error.Abort(_("cannot commit merge with missing files"))
unresolved, driverresolved = False, False
ms = mergemod.mergestate(self)
ms = mergemod.mergestate.read(self)
for f in status.modified:
if f in ms:
if ms[f] == 'u':