From 5cd784e05e9b2fc0961600fa9be97202fb8434bd Mon Sep 17 00:00:00 2001
From: "Robin H. Johnson" <robbat2@gentoo.org>
Date: Tue, 6 Oct 2015 22:45:56 -0700
Subject: Test2.

---
 foo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/foo b/foo
index df565ac..9daeafb 100644
--- a/foo
+++ b/foo
@@ -1 +1 @@
-conflict2 conflict
+test
-- 
cgit v1.2.3-65-gdbad