Merge branch 'jk/committer-date-is-author-date-fix-simplify'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"