Use merge=union strategy to avoid false merge conflicts on CalciteResource.properties
Use merge=union strategy to avoid false merge conflicts on CalciteResource.properties

merge=union avoid merge conflicts by selecting the union of the lines.
It might result in duplicate lines if different commits edit the same
line, however, it is unlikely case for CalciteResources.

looker-open-source/calcite,julianhyde/calcite,apache/calcite,apache/calcite,jcamachor/calcite,julianhyde/calcite,jcamachor/calcite,jcamachor/calcite,looker-open-source/calcite,julianhyde/calcite,apache/calcite,julianhyde/calcite,jcamachor/calcite,looker-open-source/calcite,jcamachor/calcite,julianhyde/calcite,apache/calcite,julianhyde/calcite,looker-open-source/calcite,apache/calcite,looker-open-source/calcite,apache/calcite,looker-open-source/calcite,jcamachor/calcite