Merge branch 'mh/refs-have-new'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"