| 2010-08-06 | t6038 (merge.renormalize): check that it can be turned off | blob | diff | raw | |
| 2010-08-06 | t6038 (merge.renormalize): try checkout -m and cherry... | blob | diff | raw | diff to current | |
| 2010-08-06 | t6038 (merge.renormalize): style nitpicks | blob | diff | raw | diff to current | |
| 2010-07-02 | Try normalizing files to avoid delete/modify conflicts... | blob | diff | raw | diff to current | |
| 2010-07-02 | Avoid conflicts when merging branches with mixed normal... | blob | diff | raw | diff to current | |