mergetools / gvimdiffon commit Merge branch 'jk/lib-terminal-lazy' into maint (e99a69d)
   1. "$MERGE_TOOLS_DIR/vimdiff"