mergetools / vimdiff2on commit Merge branch 'jk/push-simple' into maint (0eeb9b8)
   1. "$MERGE_TOOLS_DIR/vimdiff"