t / t4252 / am-test-1-2on commit Merge branch 'jc/color-diff-doc' (3e1b08b)
   1From: A U Thor <au.thor@example.com>
   2Date: Thu Dec 4 16:00:00 2008 -0800
   3Subject: Six
   4
   5Applying this patch with --whitespace=fix should lose 
   6the trailing whitespace after "Six".
   7
   8diff --git i/file-2 w/file-2
   9index 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