Merge branch 'jk/HEAD-symref-in-xfer-namespaces' into maint
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"