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

Attachment: signature.asc
Description: Digital signature

_______________________________________________
vcs-home mailing list
vcs-home@lists.madduck.net
http://lists.madduck.net/listinfo/vcs-home

Reply via email to