Merge branch 'jj/stash-reset-only-toplevel'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"