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