summaryrefslogtreecommitdiff
path: root/mergetools/diffmerge
AgeCommit message (Expand)Author
2013-10-13mergetools/diffmerge: support DiffMerge as a git mergetoolStefan Saasen