changeset 18612 | 0b6e6eacc939 |
parent 18605 | bcf29565d89f |
child 18631 | e2dc5397bc82 |
--- a/tests/test-subrepo.t Sat Feb 09 21:24:24 2013 +0000 +++ b/tests/test-subrepo.t Sat Feb 09 21:24:36 2013 +0000 @@ -210,7 +210,6 @@ subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg getting subrepo t - searching for copies back to rev 1 resolving manifests branchmerge: False, force: False, partial: False ancestor: 60ca1237c194, local: 60ca1237c194+, remote: 6747d179aa9a