summaryrefslogtreecommitdiff
path: root/t/t6038-merge-text-auto.sh
Commit message (Expand)AuthorAgeFilesLines
* MinGW: update tests to handle a native eol of crlftb/crlf-testsBrice Lambson2014-09-021-20/+34
* t6038-*.sh: Pass the -b (--binary) option to sed on cygwinRamsay Jones2011-01-081-1/+1
* Side-step sed line-ending "corruption" leading to t6038 failure.Eric Sunshine2010-10-031-1/+3
* t6038 (merge.renormalize): check that it can be turned offJonathan Nieder2010-08-061-1/+49
* t6038 (merge.renormalize): try checkout -m and cherry-pickJonathan Nieder2010-08-061-0/+41
* t6038 (merge.renormalize): style nitpicksJonathan Nieder2010-08-061-8/+44
* Try normalizing files to avoid delete/modify conflicts when mergingEyvind Bernhardsen2010-07-021-1/+1
* Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen2010-07-021-0/+64