diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-27 01:33:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-27 01:33:52 -0800 |
| commit | 4e4b55dd0f5b4644767265f7c16a8b370278ce56 (patch) | |
| tree | 67412de0f549d86f89bf2c05f4c39487a817fb44 /t/t5100-mailinfo.sh | |
| parent | c260d790c85c07a5f50235f664c36725deedfb10 (diff) | |
| parent | 63e50d492c658b4a0d616f57f8b43a7a9ba1bbcc (diff) | |
| download | git-4e4b55dd0f5b4644767265f7c16a8b370278ce56.tar.gz | |
Merge branch 'maint'
* maint:
git-apply: do not fix whitespaces on context lines.
diff --cc: integer overflow given a 2GB-or-larger file
mailinfo: do not get confused with logical lines that are too long.
Diffstat (limited to 't/t5100-mailinfo.sh')
| -rwxr-xr-x | t/t5100-mailinfo.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5100-mailinfo.sh b/t/t5100-mailinfo.sh index 17c1b80b5b..4d2b781a18 100755 --- a/t/t5100-mailinfo.sh +++ b/t/t5100-mailinfo.sh @@ -11,7 +11,7 @@ test_expect_success 'split sample box' \ 'git-mailsplit -o. ../t5100/sample.mbox >last && last=`cat last` && echo total is $last && - test `cat last` = 5' + test `cat last` = 6' for mail in `echo 00*` do |