tests/test-merge3.out
author Bryan O'Sullivan <bos@serpentine.com>
Fri, 16 Sep 2005 14:50:06 -0700
changeset 1267 b0633406c07a
parent 925 5a034646e472
child 1747 91c56c427171
permissions -rw-r--r--
Fix diff command so it doesn't walk the dirstate unnecessarily.

removing b
b never committed!
nothing changed