diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-23 17:38:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-23 23:38:04 -0700 |
| commit | 1c2c6112a4bf655faa768ddfca067945edf2809e (patch) | |
| tree | 985973c2d5ac3611db6e25f702eecacf7cb41939 /t/t4118-apply-empty-context.sh | |
| parent | bab36bf57d7a565e0077e1f5d2e3a10afa319ecc (diff) | |
| parent | b08bbae7e1676e5a47fa9054e268ff14ee819a3a (diff) | |
| download | git-1c2c6112a4bf655faa768ddfca067945edf2809e.tar.gz git-1c2c6112a4bf655faa768ddfca067945edf2809e.tar.xz | |
Merge branch 'master' into jc/bisect
This is to merge in the fix for path-limited bisection
from the 'master' branch.
Diffstat (limited to 't/t4118-apply-empty-context.sh')
| -rwxr-xr-x | t/t4118-apply-empty-context.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t4118-apply-empty-context.sh b/t/t4118-apply-empty-context.sh index 690a18200..27cc6f2b8 100755 --- a/t/t4118-apply-empty-context.sh +++ b/t/t4118-apply-empty-context.sh @@ -23,7 +23,8 @@ test_expect_success setup ' cat file2 >file2.orig git add file1 file2 && sed -e "/^B/d" <file1.orig >file1 && - sed -e "/^B/d" <file2.orig >file2 && + sed -e "/^[BQ]/d" <file2.orig >file2 && + echo Q | tr -d "\\012" >>file2 && cat file1 >file1.mods && cat file2 >file2.mods && git diff | |