Set this to true to ignore the merge conflicts

Try to merge definitions of inline functions. They can appear in multiple files and we would like them all to be the same. This can slow down the merger an order of magnitude !!!

Merge a number of CIL files