about summary refs log blame commit diff
path: root/third_party/git/t/t4252/am-test-2-1
blob: feda94a0cccb0a2f9eb1d8dc5c07abf16732c10b (plain) (tree)


















                                                                
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