Merge algorithms

[Andrew Bennetts]

Eli Zaretskii wrote:
[...]
> The existing merge algorithms already employ quite a bit of heuristics
> in similar cases.  For example, weave silently prefers the target
> branch's version where other algorithms just declare a conflict, and
> there are other kinds of heuristics described on the LCA pages
> mentioned in this thread.  I'm saying that the special case of
> ChangeLog files might be solvable by similarly simple heuristics.

I agree it's pretty simple to implement.  Write a plugin using the
merge_file_content hook.  Look at the news_merge plugin in the bzr tree
or the bzr-builddeb plugin's merge_file_content hook for examples.

I *might* look doing this myself next week if no-one has done it first,
and I haven't forgotten over the weekend...

-Andrew.