tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sun, 26 Mar 2006 22:54:05 +0200
changeset 2009 182f500805db
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
Fix broken hgignore tests due to full path showing up in output.

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