Strategies for push/merge problem?

[Douglas Philips]

On or about 2008 Jul 16, at 1:48 AM, Peter Arrenbrecht indited:
> Something I've been thinking about before, too, and which I would
> really really like. I could imagine a command that accepts a hunk to
> patch mapping file as input. Then this file could be created using any
> tool one desires (graphical, textual, whatever). So I for instance
> would try to integrate this into meld.

That is an intriguing idea, separating the two phases... Hmmmm...
I had been thinking along the lines of an enhanced qrecord (I hadn't  
realized qrecord existed when I used it as a theoretical example :) )  
just because that seemed simple, but esp. with GUI support one  
wouldn't want to duplicate the back-end code...

--Doug