Merge branch 'jx/clean-interactive'
[git] / mergetools / diffmerge
2013-10-14  Jonathan NiederMerge branch 'jx/clean-interactive'
2013-10-14  Jonathan NiederMerge branch 'jk/diff-algo'
2013-10-13  Stefan Saasenmergetools/diffmerge: support DiffMerge as a git mergetool