mergetools / vimdiff3on commit Merge branch 'jk/git-no-more-argv0-path-munging' into maint (af6d7a6)
   1. "$MERGE_TOOLS_DIR/vimdiff"