diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-08-11 11:03:13 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-08-11 11:03:13 -0700 |
commit | 0e9b12f874955cba820efd786e176be8ba1acc2e (patch) | |
tree | 6946d3ebc4adc74c8a26099ff00a9369636f6290 /builtin/diff-tree.c | |
parent | Merge branch 'rs/grep-function-context' (diff) | |
parent | Makefile: some changes for http-related flag documentation (diff) | |
download | tgif-0e9b12f874955cba820efd786e176be8ba1acc2e.tar.xz |
Merge branch 'rc/maint-http-wrong-free'
* rc/maint-http-wrong-free:
Makefile: some changes for http-related flag documentation
http.c: fix an invalid free()
Conflicts:
Makefile
Diffstat (limited to 'builtin/diff-tree.c')
0 files changed, 0 insertions, 0 deletions