mergetools / gvimdiffon commit Merge branch 'gr/rebase-i-drop-warn' into maint (c04b3a2)
   1. "$MERGE_TOOLS_DIR/vimdiff"