mergetools / gvimdiff3on commit Merge branch 'jk/repack-pack-writebitmaps-config' (25f3119)
   1. "$MERGE_TOOLS_DIR/vimdiff"