Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge-local.out @ 4417:0912d8df5e19
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 08 May 2007 11:42:48 -0500 |
parents | 46280c004f22 bb1800a7d7e1 |
children |
line wrap: on
line diff
--- a/tests/test-merge-local.out +++ b/tests/test-merge-local.out @@ -21,7 +21,7 @@ merging zzz1_merge_ok merging zzz1_merge_ok failed! merging zzz2_merge_bad merging zzz2_merge_bad failed! -3 files updated, 0 files merged, 1 files removed, 2 files unresolved +3 files updated, 0 files merged, 2 files removed, 2 files unresolved There are unresolved merges with locally modified files. You can redo the full merge using: hg update 0 @@ -40,7 +40,7 @@ warning: conflicts during merge. merging zzz1_merge_ok merging zzz2_merge_bad merging zzz2_merge_bad failed! -3 files updated, 1 files merged, 1 files removed, 1 files unresolved +3 files updated, 1 files merged, 2 files removed, 1 files unresolved There are unresolved merges with locally modified files. You can finish the partial merge using: hg update 0 @@ -59,7 +59,7 @@ M zzz1_merge_ok M zzz2_merge_bad # local merge without conflicts merging zzz1_merge_ok -4 files updated, 1 files merged, 1 files removed, 0 files unresolved +4 files updated, 1 files merged, 2 files removed, 0 files unresolved --- a/zzz1_merge_ok +++ b/zzz1_merge_ok +new last line