Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-rename-merge1.out @ 3314:ecc1bf27378c
merge: unify merge and copy actions
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 10 Oct 2006 00:41:55 -0500 |
parents | e7abcf3a7c5f |
children | 966632304dde |
line wrap: on
line diff
--- a/tests/test-rename-merge1.out +++ b/tests/test-rename-merge1.out @@ -4,7 +4,7 @@ merge resolving manifests overwrite None branchmerge True partial False ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c - a: remote moved -> c + a: remote moved -> m b2: remote created -> g merging a and b to b resolving a