Merge branch 'js/rebase-i-reword-to-run-hooks' into next
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"