![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Apr 2009 20:43:13 +0000 (13:43 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Apr 2009 20:43:13 +0000 (13:43 -0700) | ||
| commit | 934747323c397ffe64b6dcdf2bf73128d8e36968 | |
| tree | a02906b87b716d48d56b9b0de209fe02da65969e | tree | snapshot |
| parent | 3e73cb2f48cc4044905455a9936692f967a0f9b3 | commit | diff |
| parent | 7dae8b21c2fe39a59661c709f0dc17090dafa5a4 | commit | diff |
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0:
diff -c -p: do not die on submodules
* maint-1.6.0:
diff -c -p: do not die on submodules
| combine-diff.c | diff1 | | diff2 | | blob | history |
| t/t4027-diff-submodule.sh | diff1 | | diff2 | | blob | history |