Mercurial > hg

view tests/test-merge-revert.out @ 7057:094af6eeb7d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix conflicting variables when no native osutil is available thanks weijun for the bug report and patch, fix issue1309
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 29 Sep 2008 11:57:27 +0200
parents d2b55e3c4e25
children 4c94b6d0fb1c
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