summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
diff options
context:
space:
mode:
authorLibravatar Brian Gernhardt <brian@gernhardtsoftware.com>2011-05-05 00:43:37 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-05 09:24:21 -0700
commitc01bd5a29f38e4e9fd5c03f3e1e84b88c392dd6f (patch)
tree4459a25676b63fb2167a3e5efe7276751252868f /builtin/merge-tree.c
parentblame: tolerate bogus e-mail addresses a bit better (diff)
downloadtgif-c01bd5a29f38e4e9fd5c03f3e1e84b88c392dd6f.tar.xz
t/annotate-tests: Use echo & cat instead of sed
The use of the sed command "1i No robots allowed" caused the version of sed in OS X to die with sed: 1: "1i "No robots allowed"\n": command i expects \ followed by text Since this command was just trying to add a single line to the beginning of the file, do the same with "echo" followed by "cat". Unbreaks t8001 and t8002 on OS X 10.6.7 Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions