mergetools / gvimdiffon commit Merge branch 'tg/stash-doc-typofix' (72d30c7)
   1. "$MERGE_TOOLS_DIR/vimdiff"