tests/test-merge5.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Wed, 08 Mar 2006 14:53:57 -0800
changeset 1866 89a6ce5ae510
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
inherit hgrc so "%" interpolation works.

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)