annotate tests/bundles/issue4041.hg @ 41078:46e0563c67db

merge with stable
author Yuya Nishihara <yuya@tcha.org>
date Sun, 30 Dec 2018 17:31:57 +0900
parents ad9db007656f
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
19969
ad9db007656f rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
1 (binary:application/octet-stream)