summaryrefslogtreecommitdiff
path: root/alloc.c
diff options
context:
space:
mode:
authorLibravatar Christian Couder <chriscool@tuxfamily.org>2010-03-31 21:22:07 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-04-01 11:14:10 -0700
commitc674d0527396e4100454e8992ed7381ee29dd54e (patch)
tree2180d1998b7d49ce0fd721e36a2377f348d74c9e /alloc.c
parentmerge: refactor code that calls "git merge-STRATEGY" (diff)
downloadtgif-c674d0527396e4100454e8992ed7381ee29dd54e.tar.xz
merge: make function try_merge_command non static
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'alloc.c')
0 files changed, 0 insertions, 0 deletions