diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-03 23:26:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-03 23:26:54 -0700 |
| commit | 9aae177a4adff326421e55c7c0f3138de15ce2c1 (patch) | |
| tree | ca19b08ff373ea122f87c90d03d111b03a89921e /t | |
| parent | 50acc58914bf02217e55fdd739a844f2bfc45410 (diff) | |
| parent | e3ad95a8be82663d27cb501eaf9bad86a30f9cda (diff) | |
| download | git-9aae177a4adff326421e55c7c0f3138de15ce2c1.tar.gz | |
Merge branch 'maint'
* maint:
gitweb: use decode_utf8 directly
posix compatibility for t4200
Document 'opendiff' value in config.txt and git-mergetool.txt
Allow PERL_PATH="/usr/bin/env perl"
Make xstrndup common
diff.c: fix "size cache" handling.
http-fetch: Disable use of curl multi support for libcurl < 7.16.
Diffstat (limited to 't')
| -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" |