Mercurial > hg-stable
diff tests/test-rename-merge1.t @ 18362:5a4f220fbfca
copies: report found copies sorted
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Wed, 12 Dec 2012 02:38:14 +0100 |
parents | a6fe1b9cc68f |
children | 5ed6a375e9ca |
line wrap: on
line diff
--- a/tests/test-rename-merge1.t Tue Jan 15 02:59:12 2013 +0100 +++ b/tests/test-rename-merge1.t Wed Dec 12 02:38:14 2012 +0100 @@ -29,9 +29,9 @@ b b2 all copies found (* = to merge, ! = divergent, % = renamed and deleted): - src: 'a2' -> dst: 'c2' ! src: 'a' -> dst: 'b' * src: 'a2' -> dst: 'b2' ! + src: 'a2' -> dst: 'c2' ! checking for directory renames a2: divergent renames -> dr resolving manifests