tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 01 Apr 2006 20:56:55 +0200
changeset 2032 cd6bdbc508dd
parent 2019 ced2d3620f95
child 2038 5c4496ed152d
permissions -rw-r--r--
Don't print filenames in braces for changelog style.

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