summaryrefslogtreecommitdiff
path: root/t/t6038-merge-text-auto.sh
AgeCommit message (Expand)Author
2010-08-06t6038 (merge.renormalize): check that it can be turned offJonathan Nieder
2010-08-06t6038 (merge.renormalize): try checkout -m and cherry-pickJonathan Nieder
2010-08-06t6038 (merge.renormalize): style nitpicksJonathan Nieder
2010-07-02Try normalizing files to avoid delete/modify conflicts when mergingEyvind Bernhardsen
2010-07-02Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen