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

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

Merge with stable
Merge with stable
Stuart W Marks - - Load All Authors

File last commit:

r9717:68a1b9d0 default
r10093:a43ae577 merge default
Show More
test-merge5.out
7 lines | 289 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
Stuart W Marks
update: allow branch crossing without -c or -C, with no uncommitted changes...
 r9717 abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)
Matt Mackall
update: no -C needed to switch branches without outstanding changes
 r6350 % should succeed
Stuart W Marks
update: allow branch crossing without -c or -C, with no uncommitted changes...
 r9717 1 files updated, 0 files merged, 0 files removed, 0 files unresolved