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

r5865:e7127f66 default
r6385:0d4e068e default
Show More
test-journal-exists.out
8 lines | 237 B | text/plain | TextLexer
/ tests / test-journal-exists.out
Matt Mackall
transactions: don't show a backtrace when journal exists...
r5865 adding a
abort: journal already exists - run hg recover!
rolling back interrupted transaction
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions