summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Matthew Daley <mattjd@gmail.com>2012-12-14 02:36:30 +1300
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-12-13 11:13:44 -0800
commitbdd478d620034dc6517aea940f5dc6b88f780c04 (patch)
tree85d0bc53838a77d4160a1efa70d118bcc3bb2537 /merge-recursive.h
parentgit.txt: add missing info about --git-dir command-line option (diff)
downloadtgif-bdd478d620034dc6517aea940f5dc6b88f780c04.tar.xz
Fix sizeof usage in get_permutations
Currently it gets the size of an otherwise unrelated, unused variable instead of the expected struct size. Signed-off-by: Matthew Daley <mattjd@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions