Merge branch 'jk/open-returns-eintr'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"