[thirdparty/git.git] / t / t4252 / am-test-4-2

From: A U Thor <au.thor@example.com>
Date: Thu Dec 4 16:00:00 2008 -0800
Subject: Six

Applying this patch with -C1 -p2 should be successful even though
the patch is against a wrong level and the first context line does
not match.

diff --git i/junk/file-2 w/junk/file-2
index 06e567b..b6f3a16 100644
--- i/junk/file-2
+++ w/junk/file-2
@@ -1,7 +1,7 @@
 One
 2
-3
+Three
 4
 5
-6
+Six
 7
Commit	Line	Data
fe6beab7 JH	1	From: A U Thor <au.thor@example.com>
	2	Date: Thu Dec 4 16:00:00 2008 -0800
	3	Subject: Six
	4
	5	Applying this patch with -C1 -p2 should be successful even though
	6	the patch is against a wrong level and the first context line does
	7	not match.
	8
	9	diff --git i/junk/file-2 w/junk/file-2
	10	index 06e567b..b6f3a16 100644
	11	--- i/junk/file-2
	12	+++ w/junk/file-2
	13	@@ -1,7 +1,7 @@
	14	One
	15	2
	16	-3
	17	+Three
	18	4
	19	5
	20	-6
	21	+Six
	22	7