mergetools / gvimdiff3on commit Merge branch 'md/exclude-promisor-objects-fix-cleanup' (6e5be1f)
   1. "$MERGE_TOOLS_DIR/vimdiff"