From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 Jun 2010 18:55:37 +0000 (-0700)
Subject: Merge branch 'jl/maint-diff-ignore-submodules'
X-Git-Tag: v1.7.2-rc1~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e1165dd1442017c2b2722027168c497640f25746;p=git.git

Merge branch 'jl/maint-diff-ignore-submodules'

* jl/maint-diff-ignore-submodules:
  t4027,4041: Use test -s to test for an empty file
  Add optional parameters to the diff option "--ignore-submodules"
  git diff: rename test that had a conflicting name
---

e1165dd1442017c2b2722027168c497640f25746