![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 30 Jun 2010 18:55:37 +0000 (11:55 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 30 Jun 2010 18:55:37 +0000 (11:55 -0700) |
* 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
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
| 1 | 2 | |||
|---|---|---|---|---|
| Documentation/diff-options.txt | patch | | diff1 | | diff2 | | blob | history |
| diff.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/diff-options.txt
Simple merge
diff --cc diff.c
Simple merge