Merge branch 'jk/diff-follow-must-take-one-pathspec'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"