tests/test-merge3.out
author Matt Mackall <mpm@selenic.com>
Mon, 18 Jun 2007 13:24:34 -0500
changeset 4611 274c99fc629f
parent 1747 91c56c427171
permissions -rw-r--r--
dirstate: simplify state()

removing b
nothing changed