Merge branch 'ab/describe-tests-fix' into jch
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"