tests/test-merge3.out
author Matt Mackall <mpm@selenic.com>
Thu, 04 Jun 2009 16:21:09 -0500
changeset 8716 f3322bb29a0e
parent 1747 91c56c427171
permissions -rw-r--r--
dirstate: don't complain about 0-length files

removing b
nothing changed