##// END OF EJS Templates
resolve: restore .orig only after merge is fully complete (issue4952)...
resolve: restore .orig only after merge is fully complete (issue4952) Previously, we'd restore the .orig file after the premerge is complete but before the merge was complete. This would lead to the .orig file potentially containing merge conflict markers in it, as a leftover from the last merge attempt.
Siddharth Agarwal -
r26959:ed5f20f9 stable
Show More
Name Size Modified Last Commit Author
/ mercurial / default.d
mergetools.rc Loading ...