Re: [PATCH 5/8] rerere: use ll_merge() instead of using xdl_merge()

On Sonntag, 17. Januar 2010, Junio C Hamano wrote:

Thinking a bit more about it, the problematic point is not that a custom merge driver is used, but it is the way how conflicts are marked. For example, it seems a bit strange that an XML merge driver would mark-up conflicts using <<<<<<< and >>>>>>> in random points of XML text, when it knows that the result would be invalid XML (and subsequently an XML editor could fail to parse the result). It would be more apropriate when it used a different way to mark conflicts.

The conclusion is that your approach goes in the right direction. But since the result depends on the traditional conflict markers, it keeps rerere tied to the standard text merge driver. The capability that rerere will use custom merge drivers is of little use (unless the merge driver uses standard conflict markers); that it allows attributes for the standard text merge, is, of course, a plus.

-- Hannes