Mercurial > hg > pyhgsh

view tests/test-merge-revert.out @ 2094:c067ee483d2e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix filerevision-raw.tmpl Two bugs: - conteXt-type instead of conteNt-type - trailing newline The easiest way to fix the second one (and keep it fixed) is to put everything inline in map-raw.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Wed, 19 Apr 2006 11:39:34 -0700
parents c9226bcc288d
children b2ae81a7df29
line wrap: on
line source

1:016807e6fdaf
0:eb43f19ff115
016807e6fdaf tip
eb43f19ff115
eb43f19ff115+
reverting file1
? file1.orig
eb43f19ff115
? file1.orig
016807e6fdaf tip
merging file1
? file1.orig
016807e6fdaf tip
? file1.orig
016807e6fdaf tip
? file1.orig
016807e6fdaf tip
? file1.orig
016807e6fdaf tip