Merge branch 'tq/branch-create-wo-branch-get' into maint
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"