summaryrefslogtreecommitdiff
path: root/t/t4069-remerge-diff.sh
AgeCommit message (Expand)AuthorFilesLines
2022-02-02diff-merges: avoid history simplifications when diffing mergesLibravatar Elijah Newren1-1/+57
2022-02-02show, log: include conflict/warning messages in --remerge-diff headersLibravatar Elijah Newren1-0/+144
2022-02-02show, log: provide a --remerge-diff capabilityLibravatar Elijah Newren1-0/+91