##// END OF EJS Templates
filemerge: add debug output for whether this is a change/delete conflict...
filemerge: add debug output for whether this is a change/delete conflict Just like binary and symlink conflicts, change/delete conflicts influence the tool picked.

File last commit:

r14516:842a9179 default
r27161:296d55de default
Show More
test-ui-color.py.out
5 lines | 55 B | text/plain | TextLexer
/ tests / test-ui-color.py.out
warning
error
'buffered\n'
colored? True
colored? True