mergetools / vimdiff3on commit Merge branch 'jc/gitignore-precedence' into maint (e9f767e)
   1. "$MERGE_TOOLS_DIR/vimdiff"