tests/test-merge2.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Fri, 05 May 2006 10:31:03 -0700
changeset 2212 8164e3f31638
parent 2175 b2ae81a7df29
permissions -rw-r--r--
revert: require explicit revision when working dir has two parents.

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b