summaryrefslogtreecommitdiff
path: root/t/t6038-merge-text-auto.sh
AgeCommit message (Expand)AuthorFilesLines
2010-07-02Avoid conflicts when merging branches with mixed normalizationLibravatar Eyvind Bernhardsen1-0/+64