mergetools / gvimdiff2on commit Merge branch 'jk/doc-the-this' into maint (5e03ae4)
   1. "$MERGE_TOOLS_DIR/vimdiff"