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