| commit | ce982a2681be0392dacc333b2422a8abf6b9e437 | [log] [tgz] |
|---|---|---|
| author | Stephen Li <stephenli@google.com> | Mon May 22 17:18:39 2017 -0700 |
| committer | Stephen Li <stephenli@google.com> | Tue May 23 13:18:43 2017 -0700 |
| tree | a5df6b32c2d433ea78fe5fd3dbe16537e5324eac | |
| parent | 63e2a4eecde7155c8889f70a97276e4dd005cdb2 [diff] |
Add project, change number, and patchset number to conflict message. Allow project, change number, and conflict number to be used as interpolated fields for instructions on what to do if a conflict is hit. Change-Id: Id7ec8434c740e0b576a8d87a9dbc627c6fdb0104