[PATCH 3 of 3] filemerge: add new internal merge tool 'internal:patch'

[Matt Mackall]

On Sun, 2012-02-12 at 21:40 +0900, FUJIWARA Katsunori wrote:
> # HG changeset patch
> # User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
> # Date 1329050292 -32400
> # Node ID 4f2d7f20d502b7c98d43c85b9ae654fd65906bcf
> # Parent  b2fad545c25b5f096a23db9aa6e29251d026726c
> filemerge: add new internal merge tool 'internal:patch'

Can't say I'm excited about this.

> IMPLEMENTATION NOTES:
> 
> (A) this pach applies diff between 'base' and 'LOCAL' on 'OTHER', not
> diff between 'base' and 'OTHER' on 'LOCAL'.

Especially this piece. This sort of thing always confuses people.

-- 
Mathematics is the supreme nostalgia of our time.