tests/test-resolve.out
author Arne Babenhauserheide <bab@draketo.de>
Fri, 05 Jun 2009 15:08:45 +0200
changeset 8722 48da69ff79bd
parent 7821 9fe7e6acf525
child 9468 b2310903c462
permissions -rw-r--r--
Some platforms lack the PATH_MAX definition (eg. GNU/Hurd). Thanks to ronny for making it cleaner.

adding file
% create a second head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
% failing merge
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
% resolve -l, should be empty