mergetools / gvimdiff3on commit Merge branch 'jk/pack-bitmap' into maint (abfed73)
   1. "$MERGE_TOOLS_DIR/vimdiff"