Content - e48cd6cbde98633dd40aa8e350e5c19e68cfe2e4 - afef92d/t/t4252/am-test-4-1

Staging
v0.5.1

visit type:

https://github.com/git/git

23 January 2022, 05:21:09 UTC

Tip revision: 01b97a4cb60723d18b437efdc474503d2a9dd384 authored by Junio C Hamano on 28 December 2010, 21:52:52 UTC
Git 1.7.4-rc0

Tip revision: 01b97a4

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