t / t4252 / am-test-5-1on commit Merge branch 'fc/git-complete-helper' into fc/git-prompt-script (423b5a1)
   1From: A U Thor <au.thor@example.com>
   2Date: Thu Dec 4 16:00:00 2008 -0800
   3Subject: Six
   4
   5Applying this patch with --directory='frotz nitfol' should fail
   6
   7diff --git i/junk/file-2 w/junk/file-2
   8index 06e567b..b6f3a16 100644
   9--- i/junk/file-2
  10+++ w/junk/file-2
  11@@ -1,7 +1,7 @@
  12 One
  13 2
  14-3
  15+Three
  16 4
  17 5
  18-6
  19+Six
  20 7