?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 1718aab 883653b 5df1e0d)
Merge branches 'maint' and 'jc/http'
commit551029af305e04bed638771a3932e376243dddcb
authorJunio C Hamano <junkio@cox.net>
Thu, 14 Sep 2006 06:36:03 +0000 (13 23:36 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 14 Sep 2006 06:36:03 +0000 (13 23:36 -0700)
tree4e9159e7921a182c37f0fdf4f2c7e3c2e0f93765tree | snapshot (tar.gz zip)
parent1718aab3e434575f3faef0afd3c66552e42f178fcommit | diff
parent883653babd8ee7ea23e6a5c392bb739348b1eb61commit | diff
parent5df1e0d05cc42aeef9bf2fce243375fb6dac2121commit | diff
Merge branches 'maint' and 'jc/http'

* maint:
  http-fetch: fix alternates handling.

* jc/http:
  http-fetch: fix alternates handling.
Git mergetool