Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge-revert.out @ 3760:aeafd80c1e78

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
small fixes for test-newbranch - hg tip doesn't use the branch cache; use hg log -r in its place - commit doesn't use a HG_MERGE environment variable - change the dates from "0 0" to "1000000 0"
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 02 Dec 2006 03:16:17 -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