mergetools / gvimdiff2on commit Merge branch 'jk/upload-pack-hook' (75676c8)
   1. "$MERGE_TOOLS_DIR/vimdiff"