tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 22 Aug 2005 08:39:44 +0200
changeset 1007 2e8d96e89dfc
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
Include generated documentation in MANIFEST.
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!
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)