The binary merge strategy marks the file as conflicted but doesn't
actually change the file contents. This keeps the json hashes file
valid and alerts the user that the generator needs to be re-run.
Bug: angleproject:3083
Change-Id: Ia04e96d56a2d92ee061f25e7de79b6a1fd3ce4ab
Reviewed-on: https://chromium-review.googlesource.com/c/1423519Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
