Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 1618:ff339dd21976
Renamed c, a, d, u to modified, added, removed, unknown for users of changes()
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 12 Jan 2006 13:35:09 +0100 |
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