[MERGE][269477] Add documentation about diverged branches and refer to it when pushing fails

[Neil Martinsen-Burrell]

Bug 269477 takes issue with an error message from push that suggests 
"merge" followed by "push" again, which does nothing, because a merge 
must be committed before the branches are un-diverged.  In order to 
explain this in detail, a new help topic "diverged-branches" was added 
and a push that fails because the source and destination have diverged 
refers to this help topic.

-Neil
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: bzr-dev-4417.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20090608/11a5c875/attachment.diff