mergetools / gvimdiff2on commit Merge branch 'jk/p5302-avoid-collision-check-cost' (e7a1b38)
   1. "$MERGE_TOOLS_DIR/vimdiff"