tests/test-merge-revert.out
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 03 Apr 2006 21:38:59 +0200
changeset 2044 b343e7d454b4
parent 2036 c9226bcc288d
child 2175 b2ae81a7df29
permissions -rw-r--r--
Don't allow --style and --template for hg update and hg merge. The only way that changesets will be shown with these command is in an error message when trying to update to an ambiguous branch name.

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