mergetools / gvimdiff2on commit Merge branch 'rs/nedalloc-fixlets' (4336fdb)
   1. "$MERGE_TOOLS_DIR/vimdiff"