PQM and conflicts

[Nicholas Allen]

Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> John Arbash Meinel wrote:
>> Especially since every so often I clean up NEWS to conform to reST
>> guidelines, which would probably get really screwed up by a custom merge
>> algorithm. (Not to mention, we don't have the ability in bzr to specify
>> a custom algorithm per-file anyway).
> 
> True, but you can specify a custom merge algorithm, and *it* can behave
> differently for that single file.

That sounds interesting. Could you give some pointers to information on 
how to do this? I guess it involves hacking on the Bazaar code?

Nick