mergetools / gvimdiffon commit Merge branch 'bs/stdio-undef-before-redef' (a06f23c)
   1. "$MERGE_TOOLS_DIR/vimdiff"