summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-16 11:32:33 -0700
committerJunio C Hamano <gitster@pobox.com>2014-07-16 11:32:33 -0700
commitc9831bb09d090011a51d2645ab638cf956924513 (patch)
tree13e76cefde992120024bc06d1f18e00986e8169d /merge-recursive.c
parent6a5713b576c3e54388d58984b759e1215d425bcf (diff)
parent2a608391509dc5ea50c9b88e5b98dae6694d7011 (diff)
downloadgit-c9831bb09d090011a51d2645ab638cf956924513.tar.gz
Merge branch 'kb/path-max-must-go'
* kb/path-max-must-go: cache.h: rename cache_def_free to cache_def_clear
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions