tree b9365214368a08361a2fc9877d3a9ed4b225acbc
parent 0afcba1db1f9ebea2783adca918ae40e8baeb5be
author Stephen Li <stephenli@google.com> 1523395855 -0700
committer Stephen Li <stephenli@google.com> 1523397703 -0700

Allow a different conflict message for manifest.

Stuff like "repo download" that might work on most projects doesn't work
on manifest projects, so adding the option for a different message on
conflict so different instructions can be posted to users.

Change-Id: Icca4099a5ae875d254ab229d6231b1814a6d928e