Mercurial > hg

annotate tests/test-merge5.out @ 2095:0bf2a9e5eff1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't send "Content-Type: none" mimetypes.guess_type will return (None, None) when it can't detect the filetype.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Wed, 19 Apr 2006 11:41:22 -0700
parents 5c4496ed152d
children b2ae81a7df29
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!
2038
5c4496ed152d Tell the user the real "hg update -C" command, not just "-C" when aborting.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2019
diff changeset
5 (use 'hg merge' to merge across branches or 'hg update -C' to lose changes)