Mercurial > hg
diff tests/test-imerge.out @ 6213:5c5e45766224
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 |
line wrap: on
line diff
--- a/tests/test-imerge.out Thu Mar 06 22:23:41 2008 +0100 +++ b/tests/test-imerge.out Thu Mar 06 22:23:41 2008 +0100 @@ -46,3 +46,5 @@ 2 files updated, 0 files merged, 1 files removed, 0 files unresolved % nothing to merge abort: there is nothing to merge - use "hg update" instead +% load unknown parent +abort: merge parent e6da4671640124fe5d3d70d2f54441d6cd76ae35 not in repository