Mercurial > hg
diff tests/test-merge-local.out @ 10944:6f1894d6a6b0 stable
filemerge: use working dir parent as ancestor for backward wdir merge
I checked the tests, they were bogus in the first place
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Mon, 19 Apr 2010 20:41:53 +0200 |
| parents | a964ab624385 |
| children |
line wrap: on
line diff
--- a/tests/test-merge-local.out Mon Apr 19 20:30:31 2010 +0200 +++ b/tests/test-merge-local.out Mon Apr 19 20:41:53 2010 +0200 @@ -24,16 +24,20 @@ use 'hg resolve' to retry unresolved file merges merging zzz1_merge_ok merging zzz2_merge_bad -2 files updated, 2 files merged, 3 files removed, 0 files unresolved +warning: conflicts during merge. +merging zzz2_merge_bad failed! +2 files updated, 1 files merged, 3 files removed, 1 files unresolved +use 'hg resolve' to retry unresolved file merges --- a/zzz1_merge_ok +++ b/zzz1_merge_ok -+new first line +new last line --- a/zzz2_merge_bad +++ b/zzz2_merge_bad +another last line ++======= M zzz1_merge_ok M zzz2_merge_bad +? zzz2_merge_bad.orig # local merge with conflicts merging zzz1_merge_ok merging zzz2_merge_bad @@ -43,18 +47,23 @@ use 'hg resolve' to retry unresolved file merges merging zzz1_merge_ok merging zzz2_merge_bad -2 files updated, 2 files merged, 3 files removed, 0 files unresolved +warning: conflicts during merge. +merging zzz2_merge_bad failed! +2 files updated, 1 files merged, 3 files removed, 1 files unresolved +use 'hg resolve' to retry unresolved file merges --- a/zzz1_merge_ok +++ b/zzz1_merge_ok -+new first line +new last line --- a/zzz2_merge_bad +++ b/zzz2_merge_bad +another last line +======= ++======= +new last line ++======= M zzz1_merge_ok M zzz2_merge_bad +? zzz2_merge_bad.orig # local merge without conflicts merging zzz1_merge_ok 4 files updated, 1 files merged, 2 files removed, 0 files unresolved