Mercurial > hg
diff tests/test-copy-move-merge.out @ 6512:368a4ec603cc
merge: introduce mergestate
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 10 Apr 2008 15:02:24 -0500 |
parents | 5af5f0f9d724 |
children | af5f099d932b |
line wrap: on
line diff
--- a/tests/test-copy-move-merge.out Thu Apr 10 14:25:50 2008 +0200 +++ b/tests/test-copy-move-merge.out Thu Apr 10 15:02:24 2008 -0500 @@ -12,16 +12,16 @@ checking for directory renames a: remote moved to c -> m a: remote moved to b -> m -copying a to b -copying a to c -picked tool 'internal:merge' for a (binary False symlink False) -merging a and b -my a@fb3948d97f07+ other b@40da226db0f0 ancestor a@583c7b748052 +preserving a for resolve of b +preserving a for resolve of c +removing a +picked tool 'internal:merge' for b (binary False symlink False) +merging a and b to b +my b@fb3948d97f07+ other b@40da226db0f0 ancestor a@583c7b748052 premerge successful -removing a -picked tool 'internal:merge' for a (binary False symlink False) -merging a and c -my a@fb3948d97f07+ other c@40da226db0f0 ancestor a@583c7b748052 +picked tool 'internal:merge' for c (binary False symlink False) +merging a and c to c +my c@fb3948d97f07+ other c@40da226db0f0 ancestor a@583c7b748052 premerge successful 0 files updated, 2 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)