| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2021-12-01 | update documentation for new zdiff3 conflictStyle |  Elijah Newren | 1 | -5/+5 |
| 2019-11-07 | Documentation: fix a bunch of typos, both old and new | Elijah Newren | 1 | -1/+1 |
| 2018-08-29 | rerere: mention caveat about unmatched conflict markers |  Thomas Gummerer | 1 | -0/+4 |
| 2018-08-06 | rerere: teach rerere to handle nested conflicts | Thomas Gummerer | 1 | -0/+42 |
| 2018-08-06 | rerere: add documentation for conflict normalization | Thomas Gummerer | 1 | -0/+140 |
 |
index : tgif.git | |
| Terin's Improved Git Fork | terinjokes@gmail.com |
| summaryrefslogtreecommitdiff |