Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge5.out @ 1634:f49f602fae92

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copy & rename can ignore removed source files As mercurial now distinguishes deleted files from removed files, we can skip removed source files while copying or renaming.
author Robin Farine <robin.farine@terminus.org>
date Tue, 24 Jan 2006 13:59:01 +1300
parents 5a034646e472
children ced2d3620f95
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
1 removing b
415
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff changeset
2 this update spans a branch affecting the following files:
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents: 415
diff changeset
3 b
415
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff changeset
4 aborting update spanning branches!
819
77e121a0d870 Update output for test-merge5.
Bryan O'Sullivan <bos@serpentine.com>
parents: 814
diff changeset
5 (use update -m to merge across branches or -C to lose changes)