##// END OF EJS Templates
commit: when committing the results of a merge, it's all or nothing...
commit: when committing the results of a merge, it's all or nothing Previously, it was possible to commit just one file from a merge, which is essentially always the wrong thing to do. This fixes issue 1049.

File last commit:

r6066:f3a8b536 default
r6385:0d4e068e default
Show More
test-custom-filters.out
11 lines | 337 B | text/plain | TextLexer
/ tests / test-custom-filters.out
% Repository data:
Some stuff to ponder very carefully.
% Fresh checkout:
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Copyright 2046, The Masters
Some stuff to ponder very carefully.
M stuff.txt
% Problem encoding:
abort: missing header "Copyright 2046, The Masters" in morestuff.txt
M stuff.txt
A morestuff.txt