tests/test-merge-revert.out
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 13 Mar 2006 13:19:23 +0100
changeset 1936 8393baa0858c
parent 1933 7544700fd931
child 2029 d436b21b20dc
permissions -rw-r--r--
Make test-remove portable for strange strftime implementations (second try). I forgot to replace the date output for 'hg log -p', too.

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