tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Sun, 29 Jan 2006 09:10:13 +1300
changeset 1646 8e9c203946ae
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
Clean up paths passed to hgweb (spotted by Peter van Dijk)

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)