##// END OF EJS Templates
resolve: add a flag for the default behavior of re-merging...
resolve: add a flag for the default behavior of re-merging On its own, it's not useful, but the next commit will add an hgrc config option to make it mandatory. There is no short option, as -r almost always means --rev and this option doesn't seem like it would be so common as to mandate a short option. Differential Revision: https://phab.mercurial-scm.org/D4378
Valentin Gatien-Baron -
r39429:5d00e606 default
Show More
Name Size Modified Last Commit Author
/ hgext / fastannotate
__init__.py Loading ...
commands.py Loading ...
context.py Loading ...
error.py Loading ...
formatter.py Loading ...
protocol.py Loading ...
revmap.py Loading ...
support.py Loading ...