On Thu, 15 Apr 2010, Avery Pennarun wrote: > > > > The output seems to match neither parent in any way, and yet the > > simplification has resulted in no diff at all. Strange, no? > > mkdir testy > cd testy > git init > cp /etc/profile . > git add profile > git commit -m root > git checkout -b a master > cat /etc/profile >>profile > git commit -a -m test1 > git checkout -b b master > cat /etc/profile | tr A-Za-z a-zA-Z >profile > git commit -a -m test1b > git merge a > # produces a conflict > true >profile # blank the file > git commit -a -m resolved > git show HEAD:profile > # no output > > Note that if you instead replace the file with a nonempty (but > different) file, you get something appropriate as the output. Hmm. That does seem to be a bug. It's clearly an evil merge that doesn't match either side, and we should show it as such. And yes, changing the true >profile to echo 1 >profile changes it to suddenly show it as such. I guess the issue is that combine-diff decides that there is nothing in the result that isn't in either of the sources (because there is nothing at all in the result), and as such it's not "interesting" after all. Linus -- 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