mergetools / vimdiff2on commit Merge branch 'rs/free-and-null' (d73b46c)
   1. "$MERGE_TOOLS_DIR/vimdiff"