Andrew's git / gitweb.git / t/t4252/am-test-6-1
?
t / t4252 / am-test-6-1on commit Merge git://repo.or.cz/git-gui (a8816e7)
   1From: A U Thor <au.thor@example.com>
   2Date: Thu Dec 4 16:00:00 2008 -0800
   3Subject: Huh
   4
   5Should fail and leave rejects
   6
   7diff --git i/file-2 w/file-2
   8index 06e567b..b6f3a16 100644
   9--- i/file-2
  10+++ w/file-2
  11@@ -1,3 +1,3 @@
  12-0
  13+One
  14 2
  15 3
  16@@ -4,4 +4,4 @@
  17 4
  18 5
  19-6
  20+Six
  21 7