Junio C Hamano e1165dd144 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

2010-06-30 11:55:37 -07:00

113 KiB

Raw Blame History

View Raw