Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge7.out @ 3122:2ef0b3aae186
merge: simplify actions with helper function
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 17 Sep 2006 21:27:30 -0500 |
parents | 40e777bda455 |
children | 3fd098e0902d |
line wrap: on
line diff
--- a/tests/test-merge7.out +++ b/tests/test-merge7.out @@ -24,7 +24,7 @@ merge: warning: conflicts during merge resolving manifests overwrite None branchmerge True partial False ancestor 451c744aabcc local a070d41e8360 remote faaea63e63a9 - test.txt versions differ, resolve + test.txt: versions differ -> m merging test.txt resolving test.txt file test.txt: my fc3148072371 other d40249267ae3 ancestor 8fe46a3eb557