mergetools / gvimdiff3on commit Merge branch 'jk/pack-objects-no-bitmap-when-splitting' (26a22d8)
   1. "$MERGE_TOOLS_DIR/vimdiff"