##// END OF EJS Templates
simplemerge: enable option to resolve conflicts one way...
simplemerge: enable option to resolve conflicts one way With this change, the simplemerge algorithm grows an option to only return the local or the other hunk in a conflicting region.
Jordi GutiƩrrez Hermoso -
r26223:ed12abab default
Show More
Name Size Modified Last Commit Author
/ mercurial / default.d
mergetools.rc Loading ...