summaryrefslogtreecommitdiffstats
path: root/test/integration/mergeConflictRevert
AgeCommit message (Expand)Author
2021-06-05support reverting merge commitsJesse Duffield