mergetools / gvimdiff2on commit Merge branch 'jk/shallow-update-fix' into maint (9c7d0cc)
   1. "$MERGE_TOOLS_DIR/vimdiff"