Hi, On Thu, 28 Jun 2007, Steven Grimm wrote: > Johannes Schindelin wrote: > > Somehow I think that this should be triggered by "--ignore-space-at-eol", > > _and_ be accompanied by a test case. > > > > Should --ignore-space-at-eol be an option to git-merge? Merges are where > this functionality matters; for simple diffs, --ignore-space-at-eol > actually already covers it. Good point. However, I fail to see how the similarity detection should be so decoupled from the application. IOW what good is it if two files are rated similar if the merge cannot handle the CRLF/LF differences properly? So two points here: since the merges are what you target, you definitely should mention that in the commit message. And you should make sure that all this trickery only kicks in when the merge has a chance to succeed. Ciao, Dscho - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html