Mercurial > hg
view tests/test-conflict.out @ 12028:21984c1c83d4 stable
test-dispatch: drop test for missing working directory
hstuart reported problems when the local Python has been configured to do stuff
and crash before reaching the expected error handler.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Mon, 23 Aug 2010 22:32:36 +0200 |
parents | b2310903c462 |
children |
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 or 'hg update -C' to abandon e7fe8eb3e180+0d24b7662d3e+ tip <<<<<<< local something else ======= something >>>>>>> other M a ? a.orig