Git merge disappointment

Aristotle Pagaltzis wrote:
> It’s really the diff algorithm that’s getting fouled up.
> The solution is to use a better common marker than empty lines,
Patience diff is probably a better solution. While git diff supports it,
I don't know how to make it be used for a merge.
--
see shy jo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 828 bytes
Desc: Digital signature
URL: <http://lists.madduck.net/pipermail/vcs-home/attachments/20100426/da9480b3/attachment.pgp>