Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-at-eof
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Sep 2009 10:38:30 +0000 (03:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Sep 2009 10:38:30 +0000 (03:38 -0700)
commitbb35fefbc952d5661d8b675aa5e0c1c49c515487
tree6944e39a9ac4ce17d7c264664d9a31c9099e71ad
parentafd9db4173b99fb2fb103ec604498896a6bedaa7
parent6957eb9a39cc765862e125edeef0dd70f359cff1
Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-at-eof

* 'jc/maint-1.6.0-blank-at-eof' (early part):
  diff.c: shuffling code around
diff.c