tests/test-resolve.out
author Martin Geisler <mg@daimi.au.dk>
Wed, 18 Feb 2009 00:44:38 +0100
changeset 7790 1817e45c2212
parent 7734 9f73bddb9d0b
child 7821 9fe7e6acf525
permissions -rw-r--r--
setup: use sys.executable to call hg Executing ".\hg" does not work on Windows, but we can instead ask Python to execute hg.

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
% resolve -l, should be empty