mergetools / vimdiff3on commit Merge branch 'bw/rebase-i-ignored-submodule-fix' into maint (6baa11d)
   1. "$MERGE_TOOLS_DIR/vimdiff"