about summary refs log tree commit diff
path: root/third_party/git/t/t4252/am-test-5-1
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/git/t/t4252/am-test-5-1')
-rw-r--r--third_party/git/t/t4252/am-test-5-120
1 files changed, 20 insertions, 0 deletions
diff --git a/third_party/git/t/t4252/am-test-5-1 b/third_party/git/t/t4252/am-test-5-1
new file mode 100644
index 000000000000..da7bf29cbe30
--- /dev/null
+++ b/third_party/git/t/t4252/am-test-5-1
@@ -0,0 +1,20 @@
+From: A U Thor <au.thor@example.com>
+Date: Thu Dec 4 16:00:00 2008 -0800
+Subject: Six
+
+Applying this patch with --directory='frotz nitfol' should fail
+
+diff --git i/junk/file-2 w/junk/file-2
+index 06e567b..b6f3a16 100644
+--- i/junk/file-2
++++ w/junk/file-2
+@@ -1,7 +1,7 @@
+ One
+ 2
+-3
++Three
+ 4
+ 5
+-6
++Six
+ 7