aboutsummaryrefslogtreecommitdiff
path: root/notes-merge.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-09-08 21:36:00 -0700
committerJunio C Hamano <gitster@pobox.com>2016-09-08 21:36:00 -0700
commit9bef64223606a2c5fdc696745ce02b4af62bda90 (patch)
treecaaa4011d093adb2569ecaca4705d48b55ee9f66 /notes-merge.h
parent5e469ab66c86d5178aae71cacf9f55c3b378de03 (diff)
parentddd0bfac7cfaabc7c0422ecee9604ede9c4841d1 (diff)
downloadgit-9bef64223606a2c5fdc696745ce02b4af62bda90.tar.gz
git-9bef64223606a2c5fdc696745ce02b4af62bda90.tar.xz
Merge branch 'jk/tighten-alloc' into maint
Small code and comment clean-up. * jk/tighten-alloc: receive-pack: use FLEX_ALLOC_MEM in queue_command() correct FLEXPTR_* example in comment
Diffstat (limited to 'notes-merge.h')
0 files changed, 0 insertions, 0 deletions