Andrew's git / gitweb.git / t/t4252/am-test-2-1
?
t / t4252 / am-test-2-1on commit Merge early parts from git://ozlabs.org/~paulus/gitk.git (ea0e524)
   1From: A U Thor <au.thor@example.com>
   2Date: Thu Dec 4 16:00:00 2008 -0800
   3Subject: Three
   4
   5Application of this should be rejected even with -C1 because the
   6preimage line in the context does not match.
   7
   8diff --git i/file-1 w/file-1
   9index 06e567b..10f8342 100644
  10--- i/file-1
  11+++ w/file-1
  12@@ -1,6 +1,6 @@
  13 1
  14 2
  15-Tres
  16+Three 
  17 4
  18 5
  19 6