mergetools / gvimdiff3on commit Merge branch 'jt/remove-pack-bitmap-global' (ad7b8a7)
   1. "$MERGE_TOOLS_DIR/vimdiff"