| commit | 36039094e884baf48469caf3b933bae53d392861 | [log] [tgz] |
|---|---|---|
| author | Stephen Li <stephenli@google.com> | Tue Dec 13 16:36:09 2016 -0800 |
| committer | Stephen Li <stephenli@google.com> | Wed Apr 05 12:26:54 2017 -0700 |
| tree | 0db823c36d80f157086293ead8f2377d168c6d91 | |
| parent | e3446b32457f2e9b558ee7dd4f63a4a2f7db8937 [diff] |
Make conflict message configurable. Change-Id: I569c2001e8be38b61231fbf5ffeb79d5e10bab7e