Mercurial > hg
view tests/test-conflict.out @ 7807:bd8f44638847
help: miscellaneous language fixes
author | timeless <timeless@gmail.com> |
---|---|
date | Sat, 28 Feb 2009 12:38:45 +0100 |
parents | 92ccccb55ba3 |
children | 9fe7e6acf525 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head merging a warning: conflicts during merge. merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges e7fe8eb3e180+0d24b7662d3e+ tip <<<<<<< local something else ======= something >>>>>>> other M a ? a.orig