![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Apr 2009 23:50:31 +0000 (16:50 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Apr 2009 23:50:31 +0000 (16:50 -0700) | ||
| commit | d1c8c0c8c42912eb768a05115c798de50e595f8b | |
| tree | 6fdc20e6a100a21c0c9dbae6bcb0ab9e543a4fed | tree | snapshot |
| parent | 3e8a00ae1d529e61f38f36fdb504902064cf1f5d | commit | diff |
| parent | a2dc04ba159def766ee17db00c60bdbda477955d | commit | diff |
Merge branch 'maint'
* maint:
diff -c -p: do not die on submodules
Conflicts:
combine-diff.c
* maint:
diff -c -p: do not die on submodules
Conflicts:
combine-diff.c
| combine-diff.c | diff1 | | diff2 | | blob | history |