[merge] Make merge internals private

[Martin Pool]

In the version I have
<aaron.bentley at utoronto.ca-20060118015458-ba73c07352e1af17>
only MergeConflictHandler is in _merge.py.  Perhaps if this is meant to
be a bzrlib-internal class it would be better called
_MergeConflictHandler.  (In which case it could go back in merge.py if
you wanted :-)

I shared John's surprise that it would become private, thinking that
this would mean it wasn't possible to customize conflict handling.  So
perhaps a comment explaining the right (or new) way to do it would help.

-- 
Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060119/46d3ed48/attachment.pgp