summaryrefslogtreecommitdiff
path: root/t/t4252/am-test-5-1
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-03-06 21:34:41 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-03-06 23:58:46 -0800
commitcac42b266a5868fc54b2e54986fa2689676ec447 (patch)
treecc6a21fd29ed1965b6277e6357e8e849a3eceb0b /t/t4252/am-test-5-1
parentparse-options: add parse_options_concat() to concat options (diff)
downloadtgif-cac42b266a5868fc54b2e54986fa2689676ec447.tar.xz
builtin/merge: make checkout_fast_forward() non static
and also export it in "cache.h". Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4252/am-test-5-1')
0 files changed, 0 insertions, 0 deletions