Revision 5588dbffbd61e4906e453808c6ad32f792fea521 authored by Junio C Hamano on 10 February 2017, 20:54:23 UTC, committed by Junio C Hamano on 10 February 2017, 20:54:23 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 653078b
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
Computing file changes ...
