##// END OF EJS Templates
filemerge: add a 'leave unresolved' option to regular prompts...
filemerge: add a 'leave unresolved' option to regular prompts 'Regular' here means anything that isn't a change/delete prompt. We'll add this option to change/delete prompts in a subsequent patch.

File last commit:

r26421:4b0fc75f default
r27162:4ab69be0 default
Show More
README
7 lines | 141 B | text/plain | TextLexer
To run the tests, do:
cd tests/
python run-tests.py
See https://mercurial-scm.org/wiki/WritingTests for
more information on writing tests.