swh:1:snp:6df5a50b8107b6bbe1e51d0239d816a7503c536a
Raw File
Tip revision: bdfc6b364a51b19efbacbd46fcef5be41a5db50e authored by Junio C Hamano on 08 December 2015, 22:07:30 UTC
Git 2.6.4
Tip revision: bdfc6b3
am-test-4-1
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 -p2 because
the preimage line in the context does not match.

diff --git i/junk/file-1 w/junk/file-1
index 06e567b..10f8342 100644
--- i/junk/file-1
+++ w/junk/file-1
@@ -1,6 +1,6 @@
 1
 2
-Tres
+Three 
 4
 5
 6
back to top