mergetools / gvimdiff2on commit Merge branch 'rs/strbuf-cocci-workaround' (73df1b3)
   1. "$MERGE_TOOLS_DIR/vimdiff"