Merge branch 'jc/triangle-push-fixup'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"