tests/test-merge-revert.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 28 Apr 2006 21:52:08 +0200
changeset 2152 57729c56a23c
parent 2036 c9226bcc288d
child 2175 b2ae81a7df29
permissions -rw-r--r--
Show repo's revlog format on verify only if it doesn't match the default format. This makes it easier to run the tests with different revlog formats.

1:016807e6fdaf
0:eb43f19ff115
016807e6fdaf tip
eb43f19ff115
eb43f19ff115+
reverting file1
? file1.orig
eb43f19ff115
? file1.orig
016807e6fdaf tip
merging file1
? file1.orig
016807e6fdaf tip
? file1.orig
016807e6fdaf tip
? file1.orig
016807e6fdaf tip
? file1.orig
016807e6fdaf tip