Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2019-11-07 | Documentation: fix a bunch of typos, both old and new | 1 | -1/+1 | |
2018-08-29 | rerere: mention caveat about unmatched conflict markers | 1 | -0/+4 | |
2018-08-06 | rerere: teach rerere to handle nested conflicts | 1 | -0/+42 | |
2018-08-06 | rerere: add documentation for conflict normalization | 1 | -0/+140 |