Mercurial Mercurial > hg-stable / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge5.out
author Andrew Thompson <andrewkt@aktzero.com>
Thu, 20 Apr 2006 16:33:49 +0200
changeset 2104 f1085d34d20d
parent 2038 5c4496ed152d
child 2175 b2ae81a7df29
permissions -rw-r--r--
Add tests/test-committer This checks to see if the EMAIL environment variable is being used for commit.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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)
hg-stable