mergetools / gvimdiff2on commit Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint (b76a9e1)
   1. "$MERGE_TOOLS_DIR/vimdiff"