mergetools / gvimdiff3on commit Merge branch 'mh/packed-ref-store-prep' (daafb50)
   1. "$MERGE_TOOLS_DIR/vimdiff"