tests/test-merge-revert.out
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 22 Aug 2006 10:08:42 +0200
changeset 2976 61fcd9fac434
parent 2175 b2ae81a7df29
child 3317 966632304dde
permissions -rw-r--r--
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc and add documentation for this.

1:016807e6fdaf
0:eb43f19ff115
016807e6fdaf tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
eb43f19ff115
eb43f19ff115+
reverting file1
? file1.orig
eb43f19ff115
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
? file1.orig
016807e6fdaf tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging file1
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
? file1.orig
016807e6fdaf tip
? file1.orig
016807e6fdaf tip
? file1.orig
016807e6fdaf tip
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
? file1.orig
016807e6fdaf tip