mergetools / vimdiff2on commit Merge branch 'cr/git-work-tree-sans-git-dir' into maint (213d256)
   1. "$MERGE_TOOLS_DIR/vimdiff"