tests/test-merge3.out
author Matt Mackall <mpm@selenic.com>
Tue, 22 Aug 2006 21:02:25 -0500
changeset 3097 1b738357bba9
parent 1747 91c56c427171
permissions -rw-r--r--
merge: fold umap and added into m1 manifest

removing b
nothing changed