Mercurial > hg

comparison tests/test-imerge.out @ 6213:5c5e45766224

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
imerge: Fix unbound name error and add a test case
author Joel Rosdahl <joel@rosdahl.net>
date Thu, 06 Mar 2008 22:23:41 +0100
parents 9cd6578750b9
children c0c4c7b1e8d3
comparison
equal deleted inserted replaced
6212:e75aab656f46 6213:5c5e45766224
44 % nothing to merge -- tip 44 % nothing to merge -- tip
45 abort: there is nothing to merge 45 abort: there is nothing to merge
46 2 files updated, 0 files merged, 1 files removed, 0 files unresolved 46 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
47 % nothing to merge 47 % nothing to merge
48 abort: there is nothing to merge - use "hg update" instead 48 abort: there is nothing to merge - use "hg update" instead
49 % load unknown parent
50 abort: merge parent e6da4671640124fe5d3d70d2f54441d6cd76ae35 not in repository