diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-06-30 11:55:37 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-06-30 11:55:37 -0700 |
commit | e1165dd1442017c2b2722027168c497640f25746 (patch) | |
tree | 6b1d95aa8cd3a213bfee6eee59de308da028068a /t/t4120-apply-popt.sh | |
parent | Sync with 1.7.1.1 (diff) | |
parent | t4027,4041: Use test -s to test for an empty file (diff) | |
download | tgif-e1165dd1442017c2b2722027168c497640f25746.tar.xz |
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
Diffstat (limited to 't/t4120-apply-popt.sh')
0 files changed, 0 insertions, 0 deletions