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

r1474:1e47f6fc default
r6385:0d4e068e default
Show More
test-hgrc.out
4 lines | 114 B | text/plain | TextLexer
Matt Mackall
Add missing test output
r1474 abort: Failed to parse .../t/.hg/hgrc
File contains no section headers.
file: .../t/.hg/hgrc, line: 1
'invalid\n'