mergetools / vimdiff2on commit Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' into maint (c17866d)
   1. "$MERGE_TOOLS_DIR/vimdiff"