aboutsummaryrefslogtreecommitdiff
path: root/t/t5100/patch0017
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-29 22:30:47 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-29 22:30:48 -0700
commit52938b113b4dd09bae869326d4993a7b998e6877 (patch)
tree717e0d86b8a0d24f95b8fd3f3672d321917c4856 /t/t5100/patch0017
parent666ca59a8c88e1750386fa64c7ed4be698fd1b2a (diff)
parent176943b9658b1fa9ae3972156100d831d19c3576 (diff)
downloadgit-52938b113b4dd09bae869326d4993a7b998e6877.tar.gz
git-52938b113b4dd09bae869326d4993a7b998e6877.tar.xz
Merge branch 'jc/maint-mailinfo-mime-attr' into maint
* jc/maint-mailinfo-mime-attr: mailinfo: do not concatenate charset= attribute values from mime headers
Diffstat (limited to 't/t5100/patch0017')
-rw-r--r--t/t5100/patch00176
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t5100/patch0017 b/t/t5100/patch0017
new file mode 100644
index 000000000..35cf84c9a
--- /dev/null
+++ b/t/t5100/patch0017
@@ -0,0 +1,6 @@
+diff --git a/foo b/foo
+index e69de29..d95f3ad 100644
+--- a/foo
++++ b/foo
+@@ -0,0 +1 @@
++New content