##// END OF EJS Templates
merge: move conversion of file-key dict to action-key dict in mergeresult...
merge: move conversion of file-key dict to action-key dict in mergeresult Initially the actions dict which we get has file has keys, but later we want a dict which has actions as keys. This patch moves code computing that to mergeresult class as that's where it should be anyway. Differential Revision: https://phab.mercurial-scm.org/D8817
Pulkit Goyal -
r45836:f4a2b329 default
Show More
Name Size Modified Last Commit Author
/ mercurial / defaultrc
__init__.py Loading ...
mergetools.rc Loading ...