On 2009-09-16, Peter Kay - Syllopsium <syllops...@syllopsium.com> wrote: > > At the risk of a flaming, sysmerge is also a pain in the arse. Once you > know how to use patch files and diff properly I'm sure it is absolutely > wonderful, but it also copes badly with files that have not changed > in any significant way.
it's better at this in 4.6 than 4.5, and better again in -current.
