mergetools / gvimdiffon commit Merge branch 'jk/index-pack-wo-repo-from-stdin' into maint (b984bc5)
   1. "$MERGE_TOOLS_DIR/vimdiff"