diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-12-03 13:52:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-03 13:52:16 -0800 |
| commit | 2936824af2c0dab34c0566ae1984e47a44be77af (patch) | |
| tree | d3f70d9d1cad6e01afa8f2c536aef136eeb745ca /t/t5100/patch0016 | |
| parent | Merge branch 'mo/maint-crlf-doc' into maint (diff) | |
| parent | git am/mailinfo: Don't look at in-body headers when rebasing (diff) | |
| download | tgif-2936824af2c0dab34c0566ae1984e47a44be77af.tar.xz | |
Merge branch 'ls/maint-mailinfo-no-inbody' into maint
* ls/maint-mailinfo-no-inbody:
git am/mailinfo: Don't look at in-body headers when rebasing
Diffstat (limited to 't/t5100/patch0016')
| -rw-r--r-- | t/t5100/patch0016 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t5100/patch0016 b/t/t5100/patch0016 new file mode 100644 index 0000000000..ad64848873 --- /dev/null +++ b/t/t5100/patch0016 @@ -0,0 +1,8 @@ +--- +diff --git a/foo b/foo +index e69de29..d95f3ad 100644 +--- a/foo ++++ b/foo +@@ -0,0 +1 @@ ++content + |