##// END OF EJS Templates
merge: introduce hasconflicts() on mergeresult object...
merge: introduce hasconflicts() on mergeresult object This and upcoming patches will improve the mergeresult object making it more powerful and provide clean APIs for various things. Doing this will clean up the core merge code which is present in `update()` a bit. Differential Revision: https://phab.mercurial-scm.org/D8816

File last commit:

r29813:5f86818c default
r45835:0c849f01 default
Show More
map
2 lines | 45 B | text/plain | TextLexer
__base__ = ../paper/map
header = header.tmpl