tests/test-resolve.out
author Mads Kiilerich <mads@kiilerich.com>
Wed, 06 Jan 2010 03:27:15 +0100
branchstable
changeset 10255 26fc868cb8b0
parent 9468 b2310903c462
child 11451 51021f4c80b5
permissions -rw-r--r--
mercurial.spec: Alignment with AIX spec by Jim Hague * Require Python 2.4 or later * Note that hgk uses tk - but don't require it * Remove bashism to support ksh * Install mq.el * Handle uncompressed man pages

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 update -C' to abandon
% resolve -l, should be empty