Mercurial > hg

view tests/test-merge-revert.out @ 12260:0a63e91c519d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: unify test-merge-remove
author Adrian Buehlmann <adrian@cadifra.com>
date Sun, 12 Sep 2010 12:11:39 +0200
parents 4c94b6d0fb1c
children
line wrap: on
line source

1:08a16e8e4408
0:d29c767a4b52
08a16e8e4408 tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
d29c767a4b52
d29c767a4b52+
reverting file1
? file1.orig
d29c767a4b52
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
? file1.orig
08a16e8e4408 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
08a16e8e4408 tip
? file1.orig
08a16e8e4408 tip
? file1.orig
08a16e8e4408 tip
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
? file1.orig
08a16e8e4408 tip