Content - e48cd6cbde98633dd40aa8e350e5c19e68cfe2e4 - 215b877/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: 3c3d3f629a6176b401ebec455c5dd59ed1b5f910 authored by Junio C Hamano on 16 October 2015, 21:40:04 UTC
Git 2.6.2

Tip revision: 3c3d3f6

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