tests/test-merge-revert.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sun, 26 Mar 2006 22:54:05 +0200
changeset 2009 182f500805db
parent 1933 7544700fd931
child 2029 d436b21b20dc
permissions -rw-r--r--
Fix broken hgignore tests due to full path showing up in output.

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