##// END OF EJS Templates
keyword: mimic cmdutil.bail_if_changed even more...
keyword: mimic cmdutil.bail_if_changed even more At the check before overwriting with kwexpand, kwshrink: - abort when in middle of merge - give terser abort message

File last commit:

r5081:ea7b982b default
r6672:6004eedb default
Show More
test-simplemerge-cmd.out
0 lines | 2.5 KiB | application/octet-stream | TextLexer
/ tests / test-simplemerge-cmd.out
Binary file (application/octet-stream)