mergetools / gvimdiff2on commit Merge branch 'jk/verify-packfile-gently' (5c2c2d4)
   1. "$MERGE_TOOLS_DIR/vimdiff"