summaryrefslogtreecommitdiff
path: root/t/t4069-remerge-diff.sh
AgeCommit message (Expand)Author
2022-02-02diff-merges: avoid history simplifications when diffing mergesElijah Newren
2022-02-02show, log: include conflict/warning messages in --remerge-diff headersElijah Newren
2022-02-02show, log: provide a --remerge-diff capabilityElijah Newren