mergetools / vimdiff2on commit Merge branch 'jk/delete-modechange-conflict' into maint (5e6154f)
   1. "$MERGE_TOOLS_DIR/vimdiff"