##// END OF EJS Templates
Fix for Issue1260
Fix for Issue1260

File last commit:

r6381:0b89315d default
r6988:907e4e9b default
Show More
test-merge5.out
7 lines | 266 B | text/plain | TextLexer
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
Matt Mackall
update: better logic and messages for updates...
r6375 abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes)
Matt Mackall
update: no -C needed to switch branches without outstanding changes
r6350 % should succeed
Thomas Arendsen Hein
Fix missing space in one of the new update messages.
r6381 abort: crosses branches (use 'hg merge' or 'hg update -C')