summaryrefslogtreecommitdiff
path: root/ediff.git-mergetool
AgeCommit message (Collapse)Author
2017-07-16Add a `git-mergetool` stub for ediffLuke Shumaker