Merge branch 'hw/tutorial-favor-switch-over-checkout' into maint
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"