Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.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 | 7544700fd931 |
children | b2ae81a7df29 |
line wrap: on
line source
merge: warning: conflicts during merge merging a merging a failed! e7fe8eb3e180+0d24b7662d3e+ tip something else ======= something M a