##// END OF EJS Templates
filemerge: add a 'leave unresolved' option to change/delete prompts...
filemerge: add a 'leave unresolved' option to change/delete prompts We're going to make this option the default in an upcoming patch.

File last commit:

r7110:75fdc39b default
r27163:27b89a09 default
Show More
test-parseindex2.py.out
1 line | 5 B | text/plain | TextLexer
/ tests / test-parseindex2.py.out
done