Mercurial > hg
diff tests/test-up-local-change.out @ 6512:368a4ec603cc
merge: introduce mergestate
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 10 Apr 2008 15:02:24 -0500 |
| parents | cdc458b12f0f |
| children | 3682a19bb637 |
line wrap: on
line diff
--- a/tests/test-up-local-change.out Thu Apr 10 14:25:50 2008 +0200 +++ b/tests/test-up-local-change.out Thu Apr 10 15:02:24 2008 -0500 @@ -23,6 +23,7 @@ b a: versions differ -> m b: remote created -> g +preserving a for resolve of a picked tool 'true' for a (binary False symlink False) merging a my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b @@ -60,6 +61,7 @@ b a: versions differ -> m b: remote created -> g +preserving a for resolve of a picked tool 'true' for a (binary False symlink False) merging a my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b @@ -113,6 +115,8 @@ searching for copies back to rev 1 a: versions differ -> m b: versions differ -> m +preserving a for resolve of a +preserving b for resolve of b picked tool 'true' for a (binary False symlink False) merging a my a@802f095af299+ other a@030602aee63d ancestor a@33aaa84a386b