![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 22 Jan 2010 04:08:31 +0000 (20:08 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 22 Jan 2010 04:08:31 +0000 (20:08 -0800) |
* maint:
merge-recursive: do not return NULL only to cause segfault
retry request without query when info/refs?query fails
merge-recursive: do not return NULL only to cause segfault
retry request without query when info/refs?query fails
| 1 | 2 | |||
|---|---|---|---|---|
| merge-recursive.c | patch | | diff1 | | diff2 | | blob | history |
| remote-curl.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc merge-recursive.c
Simple merge
diff --cc remote-curl.c
Simple merge