tests/test-merge-revert.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Fri, 31 Mar 2006 10:52:56 -0800
changeset 2030 8d9ec30d58bc
parent 2029 d436b21b20dc
child 2036 c9226bcc288d
permissions -rw-r--r--
forgot to rerun tests after changed backup extension to .orig. thomas a.h. found this.

1:016807e6fdaf
0:eb43f19ff115
016807e6fdaf tip
eb43f19ff115
eb43f19ff115+
saving current version of file1 as file1.orig
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