mergetools / gvimdiffon commit Replace all die("BUG: ...") calls by BUG() ones (033abf9)
   1. "$MERGE_TOOLS_DIR/vimdiff"