On 2/2/07, Jim Blandy <jimb@xxxxxxxxxxxxxxxx> wrote:
If someone else has strong opinions, I'm definitely open on the question. It's not standard practice. But in EGLIBC, because of our intention to continue to track the FSF sources very closely, we generally need to prioritize merging slightly above legibility (although our first choise is obviously "both").
Purely out of curiosity does svk's smerge handle this merge scenario correctly? Cheers, Carlos.