Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-up-local-change.out @ 3305:e7abcf3a7c5f
filemerge: use contexts rather than my and other
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 09 Oct 2006 21:27:04 -0500 |
parents | 3fd098e0902d |
children | 966632304dde |
line wrap: on
line diff
--- a/tests/test-up-local-change.out +++ b/tests/test-up-local-change.out @@ -21,7 +21,7 @@ resolving manifests b: remote created -> g merging a resolving a -my a@33aaa84a386b other a@802f095af299 ancestor a@33aaa84a386b +my a@. other a@802f095af299 ancestor a@33aaa84a386b getting b 1 files updated, 1 files merged, 0 files removed, 0 files unresolved changeset: 1:802f095af299 @@ -55,7 +55,7 @@ resolving manifests b: remote created -> g merging a resolving a -my a@33aaa84a386b other a@802f095af299 ancestor a@33aaa84a386b +my a@. other a@802f095af299 ancestor a@33aaa84a386b getting b 1 files updated, 1 files merged, 0 files removed, 0 files unresolved changeset: 1:802f095af299 @@ -106,10 +106,10 @@ resolving manifests b: versions differ -> m merging a resolving a -my a@802f095af299 other a@030602aee63d ancestor a@33aaa84a386b +my a@. other a@030602aee63d ancestor a@33aaa84a386b merging b resolving b -my b@802f095af299 other b@030602aee63d ancestor b@000000000000 +my b@. other b@030602aee63d ancestor b@000000000000 0 files updated, 2 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) changeset: 1:802f095af299