Mercurial > hg
view tests/test-merge-revert.out @ 6486:960bc707ea10
doc: escape .hg at bol in manpages with make (issue1072)
This works around a bug in old docbook stylesheets.
Remove .*.swp example from hgignore.5.txt.
Diagnosis and workaround thanks to Alexis S. L. Carvalho.
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Mon, 07 Apr 2008 09:02:04 +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