Merge branch 'jk/push-options-via-transport-fix' into next
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"