Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge-revert.out @ 5167:4dfe4c21dd64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew-stable
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 14 Aug 2007 21:36:08 +0200
parents d2b55e3c4e25
children
line wrap: on
line source

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
1 files updated, 0 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