Code review comment for lp:~rom1-chal/bzr-builder/reporting_conflict_from_merge

Hi,

Thanks for this, it looks great.

I have a few formatting things that I would like to clean up when I merge,
but they are minor.

The thing that is stopping me doing it right now is that I'm not sure how
generally applicable the output is. I'm trying to think of things that would
both be widely useful, and still give you the information that you need.

Perhaps not showing the developers, but the revisions (like you would get from
bzr log) for each revision involved in the conflict would work?

I'm going to ponder this over the weekend, and we can get it landed next week.

Thanks,

James