mergetools / gvimdiff2on commit Merge branch 'lv/add-doc-working-tree' into maint (5276be8)
   1. "$MERGE_TOOLS_DIR/vimdiff"