Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-revert.out @ 2124:27fd8b7a6c51
Cleaned trailing whitespace in hgweb.py, removed command line shortcut for webdir-conf.
author | Alexander Schremmer <alex AT alexanderweb DOT de> |
---|---|
date | Tue, 25 Apr 2006 00:43:40 +0200 |
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