Mercurial > hg

view tests/test-merge-revert.out @ 3398:0f308690bda8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed contrib/hgdiff script to pass diffopts in the new format.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 15 Oct 2006 20:56:38 +0200
parents 966632304dde
children d2b55e3c4e25
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
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