Age | Commit message (Expand) | Author | Files | Lines |
2016-07-12 | merge: avoid "safer crlf" during recording of merge results | Junio C Hamano | 1 | -23/+28 |
2016-07-06 | convert: unify the "auto" handling of CRLF | Torsten Bögershausen | 1 | -8/+15 |
2014-09-02 | MinGW: update tests to handle a native eol of crlf | Brice Lambson | 1 | -20/+34 |
2011-01-08 | t6038-*.sh: Pass the -b (--binary) option to sed on cygwin | Ramsay Jones | 1 | -1/+1 |
2010-10-03 | Side-step sed line-ending "corruption" leading to t6038 failure. | Eric Sunshine | 1 | -1/+3 |
2010-08-06 | t6038 (merge.renormalize): check that it can be turned off | Jonathan Nieder | 1 | -1/+49 |
2010-08-06 | t6038 (merge.renormalize): try checkout -m and cherry-pick | Jonathan Nieder | 1 | -0/+41 |
2010-08-06 | t6038 (merge.renormalize): style nitpicks | Jonathan Nieder | 1 | -8/+44 |
2010-07-02 | Try normalizing files to avoid delete/modify conflicts when merging | Eyvind Bernhardsen | 1 | -1/+1 |
2010-07-02 | Avoid conflicts when merging branches with mixed normalization | Eyvind Bernhardsen | 1 | -0/+64 |