summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-13 21:21:30 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-13 21:21:30 -0800
commit52b195f2b8e0d8c9d4583aab44846698ed3149f2 (patch)
tree78724c157dc52d2b59a75983b072a4aa99627780 /merge-recursive.h
parent43176d1e4cddc4ab2f2f7dc6f3ba10513ffc2f2b (diff)
parent5914f2d057c259668695bccab8e9bec3a4bead53 (diff)
downloadgit-52b195f2b8e0d8c9d4583aab44846698ed3149f2.tar.gz
Merge branch 'jk/maint-fetch-status-table' into maint-1.7.6
* jk/maint-fetch-status-table: fetch: create status table using strbuf
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions