Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Oct 2007 19:53:54 +0000 (12:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Oct 2007 19:53:54 +0000 (12:53 -0700)
* maint:
  RelNotes-1.5.3.5: describe recent fixes
  merge-recursive.c: mrtree in merge() is not used before set
  sha1_file.c: avoid gcc signed overflow warnings
  Fix a small memory leak in builtin-add
  honor the http.sslVerify option in shell scripts

1  2 
builtin-add.c
merge-recursive.c
sha1_file.c

diff --cc builtin-add.c
Simple merge
Simple merge
diff --cc sha1_file.c
Simple merge