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

r10838:07dbafd3 stable
r27162:4ab69be0 default
Show More
test-status-inprocess.py.out
5 lines | 62 B | text/plain | TextLexer
/ tests / test-status-inprocess.py.out
% creating repo
% add and commit
C test.py
% change
M test.py