From fa4b995561e995ba372cdd05eefeeaaf719df489 Mon Sep 17 00:00:00 2001
From: Chris Truitt <christruitt@msn.com>
Date: Fri, 2 Oct 2015 09:45:13 -0700
Subject: [PATCH 1/2] Git whipped conflict resolution.

---
 conflict.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conflict.txt b/conflict.txt
index 26ddf3d..26a7614 100644
--- a/conflict.txt
+++ b/conflict.txt
@@ -1,3 +1,3 @@
 git is very useful.
-
 please keep your line here:
+git is whipped at conflict resolution.

From 45823a3080b8a95ab4eb4021947860b3a6349f76 Mon Sep 17 00:00:00 2001
From: Chris Truitt <christruitt@msn.com>
Date: Fri, 2 Oct 2015 11:32:47 -0700
Subject: [PATCH 2/2] do the stanky leg..

---
 conflict.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conflict.txt b/conflict.txt
index 26a7614..d48fea4 100644
--- a/conflict.txt
+++ b/conflict.txt
@@ -1,3 +1,4 @@
 git is very useful.
 please keep your line here:
 git is whipped at conflict resolution.
+Now watch me git...