Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint
[git/jnareb-git.git] / t / t4252 / am-test-1-1
blobb0c09dc96583758a84839cab3696aadc253272dd
1 From: A U Thor <au.thor@example.com>
2 Date: Thu Dec 4 16:00:00 2008 -0800
3 Subject: Three
5 Application of this should be rejected because the first line in the
6 context does not match.
8 diff --git i/file-1 w/file-1
9 index 06e567b..10f8342 100644
10 --- i/file-1
11 +++ w/file-1
12 @@ -1,6 +1,6 @@
13  One
14  2
16 +Three 
17  4
18  5
19  6