summaryrefslogtreecommitdiff
path: root/Documentation/technical/rerere.txt
AgeCommit message (Expand)AuthorFilesLines
2021-12-01update documentation for new zdiff3 conflictStyleLibravatar Elijah Newren1-5/+5
2019-11-07Documentation: fix a bunch of typos, both old and newLibravatar Elijah Newren1-1/+1
2018-08-29rerere: mention caveat about unmatched conflict markersLibravatar Thomas Gummerer1-0/+4
2018-08-06rerere: teach rerere to handle nested conflictsLibravatar Thomas Gummerer1-0/+42
2018-08-06rerere: add documentation for conflict normalizationLibravatar Thomas Gummerer1-0/+140