tests/test-merge-revert.out
author mcmillen@cs.cmu.edu
Sat, 25 Mar 2006 10:12:23 +0100
changeset 2005 bc47af2d3693
parent 1933 7544700fd931
child 2029 d436b21b20dc
permissions -rw-r--r--
On error parsing hgignore file, print the correct filename.

1:016807e6fdaf
0:eb43f19ff115
016807e6fdaf tip
eb43f19ff115
eb43f19ff115+
eb43f19ff115
016807e6fdaf tip
merging file1
016807e6fdaf tip
016807e6fdaf tip
016807e6fdaf tip
016807e6fdaf tip