Merge branch 'gr/rebase-i-drop-warn' into maint
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"