Merge branch 'jc/remove-export-from-config-mak-in'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"