Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge5.out @ 2023:3bdd3bf17cfa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use [ x = y ] instead of [ x == y ] in shell scripts.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 30 Mar 2006 18:43:46 +0200
parents ced2d3620f95
children 5c4496ed152d
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!
2019
ced2d3620f95 add merge command. means same thing as "update -m".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 925
diff changeset
5 (use 'hg merge' to merge across branches or '-C' to lose changes)