> No, diff and merge algorithms are symbol-oriented. Point taken, and as soon as someone puts word-by-word merging into svn or git, I'll change my opinion. >

> No, diff and merge algorithms are symbol-oriented. Point taken, and as soon as someone puts word-by-word merging into svn or git, I'll change my opinion. > I'd submit, though, that if a basic diff/merge program is being relied on too closely in a scenario where that actually causes any consequential problems [EDIT removed some response -- maybe "that" referred to a narrower scenario than I thought and parent didn't intend any insult.]