Mercurial > hg

view tests/test-merge-revert.out @ 6113:8ca25589e960

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
try to fix test-inherit-mode on HFS+ HFS+ doesn't like setgid directories, so avoid them in most of the test and do a quick check that doesn't change the output when everything's OK.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 15 Feb 2008 10:51:35 -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