tests/test-merge3.out
author Matt Mackall <mpm@selenic.com>
Tue, 22 Aug 2006 17:08:38 -0500
changeset 3002 a31557193f3c
parent 1747 91c56c427171
permissions -rw-r--r--
merge: simplify working dir manifest generation

removing b
nothing changed