mergetools / gvimdiff3on commit Merge branch 'tg/stash-doc-typofix' into next (144a25f)
   1. "$MERGE_TOOLS_DIR/vimdiff"