annotate tests/bundles/renames.hg @ 18042:551e2901192e

merge: fix mistake in moved _checkcollision call from 5881d5b7552f
author Kevin Bullock <kbullock@ringworld.org>
date Thu, 06 Dec 2012 22:07:44 -0600
parents ebf6d38c9063
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
16551
ebf6d38c9063 localrepo: add setparents() to adjust dirstate copies (issue3407)
Patrick Mezard <patrick@mezard.eu>
parents:
diff changeset
1 (binary:application/octet-stream)