mergetools / gvimdiff3on commit Merge branch 'du/get-tar-commit-id-is-plumbing' into maint (c3ba2ae)
   1. "$MERGE_TOOLS_DIR/vimdiff"