Merge branch 'kd/stash-with-bash-4.4'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"