diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-22 16:40:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-22 16:40:26 -0800 |
| commit | 6d975c24a96d607061dbcf354a50dc8410ed4b55 (patch) | |
| tree | c94dcb149e3caa50db08c5b4fe4d360844e13a13 /t/t5100/patch0015--no-inbody-headers | |
| parent | 4075d27a65e00e8eb5124b70a37f6d25c5b14d35 (diff) | |
| parent | d25e51596be9271ad833805a3d6f9012dc24ee79 (diff) | |
| download | git-6d975c24a96d607061dbcf354a50dc8410ed4b55.tar.gz | |
Merge branch 'ls/maint-mailinfo-no-inbody'
* ls/maint-mailinfo-no-inbody:
git am/mailinfo: Don't look at in-body headers when rebasing
Diffstat (limited to 't/t5100/patch0015--no-inbody-headers')
| -rw-r--r-- | t/t5100/patch0015--no-inbody-headers | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t5100/patch0015--no-inbody-headers b/t/t5100/patch0015--no-inbody-headers new file mode 100644 index 0000000000..ad64848873 --- /dev/null +++ b/t/t5100/patch0015--no-inbody-headers @@ -0,0 +1,8 @@ +--- +diff --git a/foo b/foo +index e69de29..d95f3ad 100644 +--- a/foo ++++ b/foo +@@ -0,0 +1 @@ ++content + |