tests/test-merge5.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Wed, 15 Feb 2006 11:05:43 -0800
changeset 1731 251729df9cc6
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
add -p option to tip. for issue 64.

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)