##// 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.

File last commit:

r0:9117c656 default
r26223:ed12abab default
Show More
__init__.py
0 lines | 0 B | text/x-python | PythonLexer