Merge branch 'mk/maint-apply-swap'

[git] / t / t4252 / am-test-6-1

From: A U Thor <au.thor@example.com>
Date: Thu Dec 4 16:00:00 2008 -0800
Subject: Huh

Should fail and leave rejects

diff --git i/file-2 w/file-2
index 06e567b..b6f3a16 100644
--- i/file-2
+++ w/file-2
@@ -1,3 +1,3 @@
-0
+One
 2
 3
@@ -4,4 +4,4 @@
 4
 5
-6
+Six
 7