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

r6336:4b0c9c67 default
r6385:0d4e068e default
Show More
test-revlog-packentry.out
7 lines | 335 B | text/plain | TextLexer
/ tests / test-revlog-packentry.out
adding foo
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
adding foo
created new head
rev offset length base linkrev nodeid p1 p2
0 0 0 0 0 b80de5d13875 000000000000 000000000000
1 0 24 0 1 0376abec49b8 000000000000 000000000000