Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge-revert.out @ 2178:00205fe76993
merge with crew.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Tue, 02 May 2006 14:38:32 -0700 |
parents | b2ae81a7df29 |
children | 966632304dde |
line wrap: on
line diff
--- a/tests/test-merge-revert.out +++ b/tests/test-merge-revert.out @@ -1,19 +1,24 @@ 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