Merge branch 'jn/mergetools-examdiff'
[gitweb.git] / mergetools / examdiff
2016-04-13 Merge branch 'jn/mergetools-examdiff'
2016-04-04 mergetools: add support for ExamDiff