[thirdparty/git.git] / t / t4252 / am-test-5-1

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

Applying this patch with --directory='frotz nitfol' should fail

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
b47dfe9e 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 --directory='frotz nitfol' should fail
	6
	7	diff --git i/junk/file-2 w/junk/file-2
	8	index 06e567b..b6f3a16 100644
	9	--- i/junk/file-2
	10	+++ w/junk/file-2
	11	@@ -1,7 +1,7 @@
	12	One
	13	2
	14	-3
	15	+Three
	16	4
	17	5
	18	-6
	19	+Six
	20	7