mergetools / gvimdiff3on commit Merge branch 'jk/repack-pack-keep-objects' (b7ce583)
   1. "$MERGE_TOOLS_DIR/vimdiff"