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

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

run-tests.py: print diff if reference output not existing.
run-tests.py: print diff if reference output not existing.
Thomas Arendsen Hein - - Load All Authors

File last commit:

r2175:b2ae81a7 default
r2246:3fd603eb default
Show More
test-merge5.out
6 lines | 252 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
mpm@selenic.com
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted...
 r415 this update spans a branch affecting the following files:
maf46@burn.cl.cam.ac.uk
Fix zombie files in merge...
 r616 b
mpm@selenic.com
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted...
 r415 aborting update spanning branches!
Thomas Arendsen Hein
Tell the user the real "hg update -C" command, not just "-C" when aborting.
 r2038 (use 'hg merge' to merge across branches or 'hg update -C' to lose changes)