summaryrefslogtreecommitdiff
path: root/t/t6038-merge-text-auto.sh
AgeCommit message (Expand)Author
2016-07-12merge: avoid "safer crlf" during recording of merge resultsJunio C Hamano
2016-07-06convert: unify the "auto" handling of CRLFTorsten Bögershausen
2014-09-02MinGW: update tests to handle a native eol of crlfBrice Lambson
2011-01-09t6038-*.sh: Pass the -b (--binary) option to sed on cygwinRamsay Jones
2010-10-03Side-step sed line-ending "corruption" leading to t6038 failure.Eric Sunshine
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