diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-04-29 15:40:33 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-04-29 15:40:33 -0700 |
commit | a2dc04ba159def766ee17db00c60bdbda477955d (patch) | |
tree | 961c12266b9374cd9eaa40b668ad3b897845d99c /t/t4034-diff-words.sh | |
parent | 2254da06a5473ffde973337bad2c6a96eea61e20 (diff) | |
parent | 934747323c397ffe64b6dcdf2bf73128d8e36968 (diff) | |
download | git-a2dc04ba159def766ee17db00c60bdbda477955d.tar.gz |
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1:
diff -c -p: do not die on submodules
Diffstat (limited to 't/t4034-diff-words.sh')
0 files changed, 0 insertions, 0 deletions