Mercurial > hg
diff tests/test-rename-merge2.out @ 5857:c704b03884ef
merge: add a bit more sanity to divergent copy checks
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 14 Jan 2008 16:28:32 -0600 |
parents | 8a5d8fb59ed2 |
children | 5af5f0f9d724 |
line wrap: on
line diff
--- a/tests/test-rename-merge2.out Fri Jan 11 23:36:56 2008 +0100 +++ b/tests/test-rename-merge2.out Mon Jan 14 16:28:32 2008 -0600 @@ -228,8 +228,8 @@ unmatched files in other: c all copies found (* = to merge, ! = divergent): - c -> a - b -> a + c -> a ! + b -> a ! checking for directory renames a: divergent renames -> dr rev: versions differ -> m