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

removing b
nothing changed