Submitter | Siddharth Agarwal |
---|---|
Date | Nov. 18, 2015, 5:48 a.m. |
Message ID | <b117fd7573f85100dc93.1447825715@dev666.prn1.facebook.com> |
Download | mbox | patch |
Permalink | /patch/11465/ |
State | Accepted |
Headers | show |
Comments
Patch
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -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':