mergetools / gvimdiff3on commit Merge branch 'jk/sha1-file-reduce-useless-warnings' (cedeffe)
   1. "$MERGE_TOOLS_DIR/vimdiff"