Merge branch 'cb/test-use-ere-for-alternation'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"