Mercurial > hg
view tests/test-merge-revert2.out @ 12269:877236cdd437
add: move main part to cmdutil to make it easier to reuse
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Mon, 13 Sep 2010 13:09:11 +0200 |
parents | 4c94b6d0fb1c |
children |
line wrap: on
line source
1:dfab7f3c2efb 0:c3fa057dd86f dfab7f3c2efb tip 1 files updated, 0 files merged, 0 files removed, 0 files unresolved c3fa057dd86f c3fa057dd86f+ reverting file1 c3fa057dd86f 1 files updated, 0 files merged, 0 files removed, 0 files unresolved dfab7f3c2efb tip 1 files updated, 0 files merged, 0 files removed, 0 files unresolved merging file1 warning: conflicts during merge. merging file1 failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges diff -r dfab7f3c2efb file1 --- a/file1 +++ b/file1 @@ -1,3 +1,7 @@ added file1 another line of text +<<<<<<< local +changed file1 different +======= changed file1 +>>>>>>> other M file1 ? file1.orig dfab7f3c2efb+ tip reverting file1 ? file1.orig dfab7f3c2efb tip ? file1.orig dfab7f3c2efb tip 0 files updated, 0 files merged, 0 files removed, 0 files unresolved ? file1.orig dfab7f3c2efb tip