From 1e48467370c1ab2e5a0e5947d3a1e934d1ae4914 Mon Sep 17 00:00:00 2001
From: "Robin H. Johnson" <robbat2@gentoo.org>
Date: Tue, 5 May 2015 12:02:02 -0700
Subject: Make a conflict.

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

diff --git a/foo b/foo
index 5716ca5..9b1719f 100644
--- a/foo
+++ b/foo
@@ -1 +1 @@
-bar
+conflict
-- 
cgit v1.2.3-65-gdbad