![[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) |
* maint:
diff -c -p: do not die on submodules
Conflicts:
combine-diff.c
diff -c -p: do not die on submodules
Conflicts:
combine-diff.c
| 1 | 2 | |||
|---|---|---|---|---|
| combine-diff.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc combine-diff.c
Simple merge