tests/test-merge-revert.out
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
Fri, 07 Apr 2006 22:31:54 +0200
changeset 2051 6a03cff2b0f5
parent 2036 c9226bcc288d
child 2175 b2ae81a7df29
permissions -rw-r--r--
Try to use /usr/bin/test or /bin/test to work around missing features. The builtin "test" of Solaris 8 /bin/sh doesn't understand -nt.

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