Merge branch 'ah/doc-empty-string-is-false'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"