mergetools / vimdiff3on commit Merge branch 'aq/upload-pack-use-parse-options' (0196c75)
   1. "$MERGE_TOOLS_DIR/vimdiff"