Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |