summaryrefslogtreecommitdiffstats
path: root/t/t4069-remerge-diff.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* diff-merges: avoid history simplifications when diffing mergesElijah Newren2022-02-021-1/+57
* show, log: include conflict/warning messages in --remerge-diff headersElijah Newren2022-02-021-0/+144
* show, log: provide a --remerge-diff capabilityElijah Newren2022-02-021-0/+91