Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 2149:43ce1c17e644
allow to pull from an empty repo without getting a backtrace
author | Vincent Danjean <vdanjean@free.fr> |
---|---|
date | Thu, 27 Apr 2006 22:29:02 -0700 |
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