tests/test-merge5.out
author Sascha Wilde <wilde@sha-bang.de>
Tue, 27 Jun 2006 21:56:11 +0200
changeset 2528 049f930f18c1
parent 2175 b2ae81a7df29
child 2830 49988d9f0758
permissions -rw-r--r--
Workaround to work with less sophisticated sed versions. For example NetBSD sed doesn't know about '\|'.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)