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

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

update: no -C needed to switch branches without outstanding changes
update: no -C needed to switch branches without outstanding changes
Matt Mackall - - Load All Authors

File last commit:

r6350:6aa4a3fa default
r6350:6aa4a3fa default
Show More
test-merge5.out
7 lines | 277 B | text/plain | TextLexer
/ tests / test-merge5.out
History | Source | Raw |Copy content |Copy permalink
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Bryan O'Sullivan
Update tests to match new addremove chattiness.
 r767 removing b
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Matt Mackall
update: no -C needed to switch branches without outstanding changes
 r6350 % should abort
Benoit Boissinot
Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140
 r3592 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
Matt Mackall
update: no -C needed to switch branches without outstanding changes
 r6350 % should succeed
1 files updated, 0 files merged, 0 files removed, 0 files unresolved