From 7d373e19ae185e4bfeee4361c052065d5e4af10f Mon Sep 17 00:00:00 2001
From: Matt Jacobs <matt.jacobs@walmart.com>
Date: Fri, 2 Oct 2015 09:44:06 -0700
Subject: [PATCH] This time I added a line on conflict resolution

---
 conflict.txt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/conflict.txt b/conflict.txt
index 26ddf3d..963bf5b 100644
--- a/conflict.txt
+++ b/conflict.txt
@@ -1,3 +1,6 @@
-git is very useful.
-
+<<<<<<< HEAD
+=======
+git is so-so at conflict resolution.  I think.  Let's see if I'm right.
+>>>>>>> 32315fb... This time I added a line on conflict resolution
 please keep your line here:
+git is very useful.