Merge branch 'tk/apply-dev-null-verify-name-fix'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"