tests/test-merge2.out
author mpm@selenic.com
Tue, 13 Sep 2005 18:38:27 -0500
changeset 1236 67a28636ea64
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
Fix bug with co -C across branches, update tests

adding b
adding b