tests/test-merge-revert.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 01 Apr 2006 20:56:55 +0200
changeset 2032 cd6bdbc508dd
parent 2030 8d9ec30d58bc
child 2036 c9226bcc288d
permissions -rw-r--r--
Don't print filenames in braces for changelog style.

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