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

r6093:f5b00b6e default
r6385:0d4e068e default
Show More
test-encode.out
14 lines | 335 B | text/plain | TextLexer
mpm@selenic.com
Add file encoding/decoding support
r1258 %% no changes
%% no changes
%% uncompressed contents in repo
this is a test
%% uncompress our working dir copy
this is a test
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
r2175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
mpm@selenic.com
Add file encoding/decoding support
r1258 %% uncompress our new working dir copy
this is a test
Jesse Glick
Option --decode for hg cat to apply decode filters....
r6093 %% check hg cat operation
this is a test
this is a test
this is a test
this is a test