diff options
| author | Bryan Larsen <bryan@larsen.st> | 2007-05-02 17:53:23 -0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-03 22:58:01 -0700 |
| commit | c256acb8fbd0ac1dddb6ec39aa9b3c816493122c (patch) | |
| tree | b01010a32f8d18412f45846f2b7889c04aca301a | |
| parent | e4e92b3f4bead3ee17164db35a44f8904eac9104 (diff) | |
| download | git-c256acb8fbd0ac1dddb6ec39aa9b3c816493122c.tar.gz | |
posix compatibility for t4200
Fix t4200 so that it also works on OS X by not relying on gnu
extensions to sed.
Signed-off-by: Bryan Larsen <bryan@larsen.st>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rwxr-xr-x | t/t4200-rerere.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh index 6ba63d7173..c64ebbb2e9 100755 --- a/t/t4200-rerere.sh +++ b/t/t4200-rerere.sh @@ -44,7 +44,7 @@ mkdir .git/rr-cache test_expect_failure 'conflicting merge' 'git pull . first' -sha1=$(sed -e 's/\t.*//' .git/rr-cache/MERGE_RR) +sha1=$(sed -e 's/ .*//' .git/rr-cache/MERGE_RR) rr=.git/rr-cache/$sha1 test_expect_success 'recorded preimage' "grep ======= $rr/preimage" |