Lines Matching full:merging
540 // avoid gratuitous conflicts when merging into the master branch.906 merging (from LALR or IELR) and default reductions corrupt the