Mercurial > hg
view tests/test-conflict.out @ 1130:1ad52c7679e1
Longer variable names in hgwebdir: l->repos, v->name, r->path
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sun, 28 Aug 2005 17:53:37 +0200 |
parents | 5a034646e472 |
children | 7544700fd931 |
line wrap: on
line source
merge: warning: conflicts during merge merging a merging a failed! 32e80765d7fe+75234512624c+ tip something else ======= something M a