mergetools / gvimdiff2on commit Merge branch 'ds/test-multi-pack-index' (5fb9263)
   1. "$MERGE_TOOLS_DIR/vimdiff"