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/patch0006 | |
| 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/patch0006')
| -rw-r--r-- | t/t5100/patch0006 | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t5100/patch0006 b/t/t5100/patch0006 new file mode 100644 index 0000000000..8ce155167d --- /dev/null +++ b/t/t5100/patch0006 @@ -0,0 +1,14 @@ +--- + foo | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/foo b/foo +index 9123cdc..918dcf8 100644 +--- a/foo ++++ b/foo +@@ -1 +1 @@ +-Fri Jun 9 00:44:04 PDT 2006 ++Fri Jun 9 00:44:13 PDT 2006 +-- +1.4.0.g6f2b + |