tests/test-merge-revert.out
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 19 Apr 2006 07:09:15 +0200
changeset 2088 f16435b45780
parent 2036 c9226bcc288d
child 2175 b2ae81a7df29
permissions -rw-r--r--
Exit test-hup only after the background process has died. Otherwise the open file might let the tests fail on NFS.

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