summaryrefslogtreecommitdiff
path: root/xdiff/xmerge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-11-04 14:58:01 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-11-04 14:58:02 -0800
commita3a9cff0371f5dd3dd199ef227911cd812e1708d (patch)
tree80bb14edae19fa4e93a854f64ebeaf6ae8392568 /xdiff/xmerge.c
parentMerge branch 'sc/doc-howto-dumb-http' (diff)
parentt: use perl instead of "$PERL_PATH" where applicable (diff)
downloadtgif-a3a9cff0371f5dd3dd199ef227911cd812e1708d.tar.xz
Merge branch 'jk/wrap-perl-used-in-tests'
* jk/wrap-perl-used-in-tests: t: use perl instead of "$PERL_PATH" where applicable t: provide a perl() function which uses $PERL_PATH
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions