mergetools / gvimdiffon commit Merge branch 'jk/guess-repo-name-regression-fix' into maint (52f6893)
   1. "$MERGE_TOOLS_DIR/vimdiff"