Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-double-merge.out @ 5046:bf444a9a9c23
Merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 01 Aug 2007 14:03:48 -0500 |
| parents | f191bc3916f7 |
| children | 17ed9b9a0d03 |
line wrap: on
line diff
new file mode 100644 --- /dev/null +++ b/tests/test-double-merge.out @@ -0,0 +1,20 @@ +resolving manifests + overwrite None partial False + ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9 + foo: versions differ -> m + foo: remote copied to bar -> m +copying foo to bar +merging foo and bar +my foo@2092631ce82b+ other bar@7731dad1c2b9 ancestor foo@310fd17130da +merging foo +my foo@2092631ce82b+ other foo@7731dad1c2b9 ancestor foo@310fd17130da +0 files updated, 2 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +-- foo -- +line 0 +line 1 +line 2-1 +-- bar -- +line 0 +line 1 +line 2-2