[MERGE] Use correct index when emitting conflicted-b (fixes #196780)

Robert Collins robertc at robertcollins.net
Mon Mar 3 14:45:10 GMT 2008

Robert Collins has voted approve.
Status is now: Approved
Might be nice for NEWS to say 'fixes some IndexError errors' or 
something like that.

For details, see: 

More information about the bazaar mailing list