This way users can see on the change that the cherry-pick resulted in
conflicts that need to be resolved manually before submitting the
change. To resolve the conflicts users need to know which files have
conflicts and they don't want to inspect each file in the change
manually to find this out. This is why it's useful to post the list of
files that contain conflicts as a change message on the cherry-pick
change.
Change-Id: Iab7b1f67ab59b55e4b0256d79ec173a882db8267
Signed-off-by: Edwin Kempin <ekempin@google.com>
206b51388b