tests/test-merge-revert.out
author "Mathieu Clabaut <mathieu.clabaut@gmail.com>"
Wed, 02 Aug 2006 09:29:17 +0200
changeset 2773 871ca5b9d348
parent 2175 b2ae81a7df29
child 3317 966632304dde
permissions -rw-r--r--
Import say a file is not tracked after patching : test case

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