mergetools / gvimdiffon commit Merge branch 'jk/commit-author-parsing' (9ff700e)
   1. "$MERGE_TOOLS_DIR/vimdiff"