git/t/t4252/am-test-3-2

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

Applying this patch with -p2 should be successful even though
the patch is against a wrong level.

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 @@
 1
 2
-3
+Three
 4
 5
-6
+Six
 7
Test that git-am does not lose -C/-p/--whitespace options These tests make sure that "git am" does not lose command line options specified when it was started, after it is interrupted by a patch that does not apply earlier in the series. Signed-off-by: Junio C Hamano <gitster@pobox.com> 2008-12-05 01:08:48 +00:00			`From: A U Thor <au.thor@example.com>`
			`Date: Thu Dec 4 16:00:00 2008 -0800`
			`Subject: Six`

			`Applying this patch with -p2 should be successful even though`
			`the patch is against a wrong level.`

			`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 @@`
			`1`
			`2`
			`-3`
			`+Three`
			`4`
			`5`
			`-6`
			`+Six`
			`7`