summaryrefslogtreecommitdiff
path: root/builtin-merge.c
diff options
context:
space:
mode:
authorLibravatar Brandon Casey <casey@nrlssc.navy.mil>2009-05-06 13:29:14 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-05-06 11:49:05 -0700
commit723570469f54449e54dcc8bbb8f1dcbaff29d535 (patch)
treea4c7cfde1137a564b2bd83853193078d9ceeeb03 /builtin-merge.c
parentt8005: use egrep when extended regular expressions are required (diff)
downloadtgif-723570469f54449e54dcc8bbb8f1dcbaff29d535.tar.xz
t4118: add missing '&&'
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions