Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint
[git/jnareb-git.git] / t / t4252 / am-test-3-2
blob0081b96f2a92ca3768e2763dc97c379f2ffc5d7e
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 -p2 should be successful even though
6 the patch is against a wrong level.
8 diff --git i/junk/file-2 w/junk/file-2
9 index 06e567b..b6f3a16 100644
10 --- i/junk/file-2
11 +++ w/junk/file-2
12 @@ -1,7 +1,7 @@
13  1
14  2
16 +Three
17  4
18  5
20 +Six
21  7