Mercurial > hg
diff tests/test-rename-merge2.t @ 18634:4b5d37ca3c11
tests: getremove test output changes (fold into previous patch)
author | Bryan O'Sullivan <bryano@fb.com> |
---|---|
date | Sat, 09 Feb 2013 15:22:10 -0800 |
parents | e2dc5397bc82 |
children | 5cc71484ee9c |
line wrap: on
line diff
--- a/tests/test-rename-merge2.t Sat Feb 09 15:22:09 2013 -0800 +++ b/tests/test-rename-merge2.t Sat Feb 09 15:22:10 2013 -0800 @@ -290,7 +290,6 @@ rev: versions differ -> m preserving rev for resolve of rev removing a - updating: a 1/3 files (33.33%) getting b updating: b 2/3 files (66.67%) updating: rev 3/3 files (100.00%)