Mercurial > hg

view tests/test-commit-unresolved.out @ 7512:0d488f7f321d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix test-acl failure on AIX due to read only LOGNAME. On AIX /etc/profile sets LOGNAME read only. This causes test-acl to fail when it comes to set LOGNAME in do_push(). Work around this by using env to set LOGNAME and run the command.
author Jim Hague <jim.hague@acm.org>
date Thu, 04 Dec 2008 13:42:47 +0000
parents 7c36a4fb05a3
children 9fe7e6acf525
line wrap: on
line source

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