mergetools / vimdiff3on commit Merge branch 'nd/ignore-glob-doc-update' into next (22ba92e)
   1. "$MERGE_TOOLS_DIR/vimdiff"