##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

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.
Dirkjan Ochtman - - Load All Authors

File last commit:

r6336:4b0c9c67 default
r6385:0d4e068e default
Show More
test-merge2.out
8 lines | 276 B | text/plain | TextLexer
/ tests / test-merge2.out
History | Source | Raw |Copy content |Copy permalink
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Bryan O'Sullivan
Update tests to match new addremove chattiness.
 r767 adding b
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Bryan O'Sullivan
Update tests to match new addremove chattiness.
 r767 adding b
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head