[MERGE] help criss-cross should suggest using remerge

[Martin Pool]

It seems to me people who've got a criss-cross warning from merge will
commonly want to use remerge.  If that's correct we could suggest it...
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: text/x-patch
Size: 2582 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080402/58eb4b9e/attachment.bin