tests/test-commit-unresolved.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 07 Nov 2008 13:02:04 +0100
changeset 7329 fd4bf5269733
parent 6888 7c36a4fb05a3
child 7821 9fe7e6acf525
permissions -rw-r--r--
Do not abort with inotify extension enabled, but not supported by the system. And remove the "native support is required" message which is generated at an inappropriate location and is printed more than once when using 'hg status'.

1 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head

% Merging a conflict araises
merging A
warning: conflicts during merge.
merging A failed!
1 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges

% Correct the conflict without marking the file as resolved
abort: unresolved merge conflicts (see hg resolve)

% Mark the conflict as resolved and commit