summaryrefslogtreecommitdiff
path: root/builtin-merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2008-02-20 19:01:16 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-02-20 20:21:43 -0800
commit14a5c7c19351a7db56803c9086b133fe131f55f6 (patch)
tree4b38915006ab5081ba52b50ea5372cebbbf83dd8 /builtin-merge-ours.c
parentt3404: use configured shell instead of /bin/sh (diff)
downloadtgif-14a5c7c19351a7db56803c9086b133fe131f55f6.tar.xz
diff: fix java funcname pattern for solaris
The Solaris regex library doesn't like having the '$' anchor inside capture parentheses. It rejects the match, causing t4018 to fail. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions