changeset 12117 | a40372c1c731 |
parent 12116 | f51858009328 |
child 12118 | ab2ccdce985d |
--- a/tests/test-resolve.out Mon Aug 30 14:04:38 2010 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -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 -% resolve -l, should be empty