| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | rerere: mention caveat about unmatched conflict markers | Thomas Gummerer | 2018-08-29 | 1 | -0/+4 |
| * | rerere: teach rerere to handle nested conflicts | Thomas Gummerer | 2018-08-06 | 1 | -0/+42 |
| * | rerere: add documentation for conflict normalization | Thomas Gummerer | 2018-08-06 | 1 | -0/+140 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |