Merge branch 'jl/maint-diff-ignore-submodules' into next
commitd75dbf1e37a6d7903628602251503041afaeee58
authorJunio C Hamano <gitster@pobox.com>
Fri, 25 Jun 2010 17:55:08 +0000 (25 10:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 25 Jun 2010 17:55:08 +0000 (25 10:55 -0700)
tree826b4f6d7857b3fee8dac7ba942d2562c0024b04
parenteb6f21611e553cb1cc86c116fbd2ee4cb9dd3acb
parent6ed7ddaadba9217b794aecf6d74a2e455daf7a96
Merge branch 'jl/maint-diff-ignore-submodules' into next

* jl/maint-diff-ignore-submodules:
  t4027,4041: Use test -s to test for an empty file