mergetools / gvimdiff3on commit Merge branch 'tg/stash-with-pathspec-fix' (087d1a8)
   1. "$MERGE_TOOLS_DIR/vimdiff"