mergetools / gvimdiffon commit Merge branch 'ab/die-errors-in-threaded' (c7ee0ba)
   1. "$MERGE_TOOLS_DIR/vimdiff"