hg-git / tests / test-conflict-2.out

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
warning: conflicts during merge.
merging afile failed!
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
@    3:2,1   120385945d08   1970-01-01 00:00 +0000   test
|\     merge to B
| |
| o  2:0   ea82b67264a1   1970-01-01 00:00 +0000   test
| |    A->C
| |
o |  1   7205e83b5a3f   1970-01-01 00:00 +0000   test
|/     A->B
|
o  0   5d1a6b64f9d0   1970-01-01 00:00 +0000   test
     origin

Initialized empty Git repository in gitrepo/

pushing to git://localhost/gitrepo
exporting hg objects to git
creating and sending data
importing git objects into hg
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% expect the same revision ids as above
@    3:1,2   120385945d08   1970-01-01 00:00 +0000   test
|\     merge to B
| |
| o  2:0   7205e83b5a3f   1970-01-01 00:00 +0000   test
| |    A->B
| |
o |  1   ea82b67264a1   1970-01-01 00:00 +0000   test
|/     A->C
|
o  0   5d1a6b64f9d0   1970-01-01 00:00 +0000   test
     origin
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.