mergetools / gvimdiffon commit Merge branch 'jk/fetch-pack' into maint (591a1da)
   1. "$MERGE_TOOLS_DIR/vimdiff"