##// END OF EJS Templates
merge.applyupdates: use counters from mergestate...
merge.applyupdates: use counters from mergestate This eliminates a whole bunch of duplicate code and allows us to update the removed count for change/delete conflicts where the delete action was chosen.
Siddharth Agarwal -
r27078:a421deba default
Show More
Name Size Modified Last Commit Author
/ mercurial / default.d
mergetools.rc Loading ...