mergetools / vimdiff2on commit Merge branch 'jc/cocci-xstrdup-or-null' (a039738)
   1. "$MERGE_TOOLS_DIR/vimdiff"