##// END OF EJS Templates
Merge with crew-stable
Merge with crew-stable

File last commit:

r3592:fffc8a73 default
r4806:79210a63 merge default
Show More
test-merge5.out
3 lines | 159 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
Benoit Boissinot
Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140
r3592 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes