tree 0db823c36d80f157086293ead8f2377d168c6d91
parent e3446b32457f2e9b558ee7dd4f63a4a2f7db8937
author Stephen Li <stephenli@google.com> 1481675769 -0800
committer Stephen Li <stephenli@google.com> 1491420414 -0700

Make conflict message configurable.

Change-Id: I569c2001e8be38b61231fbf5ffeb79d5e10bab7e