mergetools / gvimdiffon commit Merge branch 'jk/pack-idx-corruption-safety' (d087046)
   1. "$MERGE_TOOLS_DIR/vimdiff"