summaryrefslogtreecommitdiff
path: root/t/t4252/am-test-2-1
diff options
context:
space:
mode:
authorGraydon, Tracy <tracy.graydon@intel.com>2013-01-31 17:08:15 -0800
committerGraydon, Tracy <tracy.graydon@intel.com>2013-01-31 17:08:15 -0800
commit699fc9f67a9a62df492d1cd049e4978953640de9 (patch)
treef0c16f1494bd71922e7bf5258037427cac4a350b /t/t4252/am-test-2-1
downloadgit-699fc9f67a9a62df492d1cd049e4978953640de9.tar.gz
git-699fc9f67a9a62df492d1cd049e4978953640de9.tar.bz2
git-699fc9f67a9a62df492d1cd049e4978953640de9.zip
Diffstat (limited to 't/t4252/am-test-2-1')
-rw-r--r--t/t4252/am-test-2-119
1 files changed, 19 insertions, 0 deletions
diff --git a/t/t4252/am-test-2-1 b/t/t4252/am-test-2-1
new file mode 100644
index 0000000..feda94a
--- /dev/null
+++ b/t/t4252/am-test-2-1
@@ -0,0 +1,19 @@
+From: A U Thor <au.thor@example.com>
+Date: Thu Dec 4 16:00:00 2008 -0800
+Subject: Three
+
+Application of this should be rejected even with -C1 because the
+preimage line in the context does not match.
+
+diff --git i/file-1 w/file-1
+index 06e567b..10f8342 100644
+--- i/file-1
++++ w/file-1
+@@ -1,6 +1,6 @@
+ 1
+ 2
+-Tres
++Three
+ 4
+ 5
+ 6