mergetools / gvimdiff2on commit Merge branch 'jc/fix-diff-no-index-diff-opt-parse' (7b6bc4d)
   1. "$MERGE_TOOLS_DIR/vimdiff"