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
Junio C Hamano committed
Jun 30, 2010 at 11:55 UTC
e1165dd1442017c2b2722027168c497640f25746
No changes.