Coordinated change to change merge policy syntax

Change-Id: Ie4a36562c98d2b5aa03d1601fa54d980a79ce7b9
1 file changed
tree: f88ae4ccc3791d4c2348cbe65472e5583ced26ad
  1. .gitignore
  2. asterix-bad/
  3. asterix-opt-bom/
  4. pom.xml