Mercurial > public > mercurial-scm > hg
diff tests/test-copy-move-merge.out @ 5059:8d9bdcbb2b18
merge: avoid double deletion mentioned in issue636
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 02 Aug 2007 12:29:10 -0500 |
| parents | |
| children | 17ed9b9a0d03 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-copy-move-merge.out Thu Aug 02 12:29:10 2007 -0500 @@ -0,0 +1,23 @@ +1 files updated, 0 files merged, 2 files removed, 0 files unresolved +resolving manifests + overwrite None partial False + ancestor 583c7b748052 local fb3948d97f07+ remote 40da226db0f0 + a: remote moved to c -> m + a: remote moved to b -> m +copying a to b +copying a to c +merging a and b +my a@fb3948d97f07+ other b@40da226db0f0 ancestor a@583c7b748052 +removing a +merging a and c +my a@fb3948d97f07+ other c@40da226db0f0 ancestor a@583c7b748052 +0 files updated, 2 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +-- b -- +0 +1 +2 +-- c -- +0 +1 +2