mergetools / gvimdiff2on commit Merge branch 'jk/upload-pack-keepalive' (7b8315b)
   1. "$MERGE_TOOLS_DIR/vimdiff"