diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-09-03 09:43:44 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-09-03 09:43:44 -0700 |
commit | 9502751181df4a1347b3bd0fe2f0f0cde9cfaa91 (patch) | |
tree | daaf6620e5c56375773b5fa9cd495a106f89739e /t/t4135/diff-with tab.diff | |
parent | Merge branch 'jn/merge-custom-no-trivial' (diff) | |
parent | apply: handle traditional patches with space in filename (diff) | |
download | tgif-9502751181df4a1347b3bd0fe2f0f0cde9cfaa91.tar.xz |
Merge branch 'jn/apply-filename-with-sp'
* jn/apply-filename-with-sp:
apply: handle traditional patches with space in filename
tests: exercise "git apply" with weird filenames
apply: split quoted filename handling into new function
Diffstat (limited to 't/t4135/diff-with tab.diff')
-rw-r--r-- | t/t4135/diff-with tab.diff | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t4135/diff-with tab.diff b/t/t4135/diff-with tab.diff new file mode 100644 index 0000000000..4e6d9b2941 --- /dev/null +++ b/t/t4135/diff-with tab.diff @@ -0,0 +1,5 @@ +--- post image.txt.orig 2010-08-18 20:13:31.616002255 -0500 ++++ post image.txt 2010-08-18 20:13:31.616002255 -0500 +@@ -1 +1 @@ +-preimage ++postimage |