##// END OF EJS Templates
localrepo.commit: switch to mergestate.read()...
Siddharth Agarwal -
r26996:bf3eec62 default
parent child Browse files
Show More
@@ -1556,7 +1556,7 b' class localrepository(object):'
1556 raise error.Abort(_("cannot commit merge with missing files"))
1556 raise error.Abort(_("cannot commit merge with missing files"))
1557
1557
1558 unresolved, driverresolved = False, False
1558 unresolved, driverresolved = False, False
1559 ms = mergemod.mergestate(self)
1559 ms = mergemod.mergestate.read(self)
1560 for f in status.modified:
1560 for f in status.modified:
1561 if f in ms:
1561 if f in ms:
1562 if ms[f] == 'u':
1562 if ms[f] == 'u':
General Comments 0
You need to be logged in to leave comments. Login now