summaryrefslogtreecommitdiff
path: root/unpack-trees.c
diff options
context:
space:
mode:
authorArjen Laarhoven <arjen@yaph.org>2008-09-08 18:29:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-09-08 21:26:23 (GMT)
commit10708a994a632c392ab58aa7d11e49b322aa1505 (patch)
tree6c774edba460f05992a911450031b504ed17f057 /unpack-trees.c
parentbfd083b734fe812b347ee71dca416d2bcfa87480 (diff)
downloadgit-10708a994a632c392ab58aa7d11e49b322aa1505.zip
git-10708a994a632c392ab58aa7d11e49b322aa1505.tar.gz
git-10708a994a632c392ab58aa7d11e49b322aa1505.tar.bz2
t6023-merge-file: Work around non-portable sed usage
OS X sed doesn't understand '\n' on the right side of a substitution. Use a valid substitution character instead and use 'tr' to convert those to a newline. Signed-off-by: Arjen Laarhoven <arjen@yaph.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'unpack-trees.c')
0 files changed, 0 insertions, 0 deletions