Merge branch 'nd/branch-show-rebase-bisect-state'
[git/jnareb-git.git] / t / t4252 / am-test-2-2
blob2ac66009763fd162329884fd0771435fe3d5a26f
1 From: A U Thor <au.thor@example.com>
2 Date: Thu Dec 4 16:00:00 2008 -0800
3 Subject: Six
5 Applying this patch with -C1 should be successful even though 
6 the first line in the context does not match.
8 diff --git i/file-2 w/file-2
9 index 06e567b..b6f3a16 100644
10 --- i/file-2
11 +++ w/file-2
12 @@ -1,7 +1,7 @@
13  One
14  2
16 +Three
17  4
18  5
20 +Six
21  7