Merge branch 'tg/stash-untracked-with-pathspec-fix'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"