tests/test-merge2.out
author Matt Mackall <mpm@selenic.com>
Thu, 02 Aug 2007 12:29:10 -0500
changeset 5059 8d9bdcbb2b18
parent 2175 b2ae81a7df29
permissions -rw-r--r--
merge: avoid double deletion mentioned in issue636

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