Merge branch 'jk/prompt-stash-could-be-packed' into maint
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"