tests/test-merge5.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Thu, 16 Feb 2006 08:48:31 -0800
changeset 1727 019e6a47a53e
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
fix names of parent changeset ids in hooks. fix hook part of man page.

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)