annotate tests/bundles/renames.hg @ 31119:13bbcd56c57a

merge with stable
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 28 Feb 2017 11:13:25 -0800
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)