| commit | 10708a994a632c392ab58aa7d11e49b322aa1505 | |
| author | Arjen Laarhoven <arjen@yaph.org> | |
| Mon, 8 Sep 2008 18:29:18 +0000 (8 20:29 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 8 Sep 2008 21:26:23 +0000 (8 14:26 -0700) | ||
| tree | 6c774edba460f05992a911450031b504ed17f057 | treesnapshot (tar.gz zip) |
| parent | bfd083b734fe812b347ee71dca416d2bcfa87480 | commitdiff |
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>
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>
| t/t6023-merge-file.sh | diffblobblamehistory |