summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar John Keeping <john@keeping.me.uk>2016-02-21 17:32:22 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-02-23 15:03:43 -0800
commit3b1442d5d23577ed3570023d338cd12298b16867 (patch)
treed17a21759f7f696512c43eff25f3a0f7f203d3c8 /merge-recursive.c
parentt8005: avoid grep on non-ASCII data (diff)
downloadtgif-3b1442d5d23577ed3570023d338cd12298b16867.tar.xz
t9200: avoid grep on non-ASCII data
GNU grep 2.23 detects the input used in this test as binary data so it does not work for extracting lines from a file. We could add the "-a" option to force grep to treat the input as text, but not all implementations support that. Instead, use sed to extract the desired lines since it will always treat its input as text. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions