mergetools / gvimdiffon commit Merge branch 'rs/merge-add-strategies-simplification' into maint (24c88ad)
   1. "$MERGE_TOOLS_DIR/vimdiff"