From 01538d46bac4d2607ad01d04548085f6918ba4d0 Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Tue, 17 Feb 2015 21:09:21 +0000
Subject: add functions for conflicted changes

---
 foo | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 foo

(limited to 'foo')

diff --git a/foo b/foo
new file mode 100644
index 0000000..1a18f73
--- /dev/null
+++ b/foo
@@ -0,0 +1,5 @@
+
+foo
+
+foo
+bar
-- 
cgit v1.2.3