Merge branch 'kw/commit-keep-index-when-pre-commit-is-not-run' into next
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"