mergetools / gvimdiffon commit Merge branch 'ma/parse-maybe-bool' into next (ba22bb8)
   1. "$MERGE_TOOLS_DIR/vimdiff"