Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-at-eof
[git] / t / t4252 / am-test-1-2
1 From: A U Thor <au.thor@example.com>
2 Date: Thu Dec 4 16:00:00 2008 -0800
3 Subject: Six
4
5 Applying this patch with --whitespace=fix should lose 
6 the trailing whitespace after "Six".
7
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  1
14  2
15 -3
16 +Three
17  4
18  5
19 -6
20 +Six 
21  7