Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
[git/jnareb-git.git] / t / t4252 / am-test-5-2
blob373025bcf614292370a32871b74a5353aa067055
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 --directory='frotz nitfol' should succeed
7 diff --git i/file-5 w/file-5
8 new file mode 100644
9 index 000000..1d6ed9f
10 --- /dev/null
11 +++ w/file-5
12 @@ -0,0 +1,3 @@
13 +One
14 +two
15 +three