mergetools / gvimdiff2on commit Merge branch 'rs/apply-avoid-over-reading' into maint (bc2c50f)
   1. "$MERGE_TOOLS_DIR/vimdiff"