Merge pull request #2 from ridespirals/branch-test

ridespirals · web-flow · commit ccc8fa4421ac · 2017-09-14T15:18:37.000-07:00
Branch test
diff --git a/four.file b/four.file
@@ -0,0 +1,8 @@
+ this is the fourth file
+
+
+ insert a line in the middle
+
+ a new line in the file
+
+
diff --git a/tester.file b/tester.file
@@ -1,6 +1,4 @@
-here is some text
-
-two lines of it in fact
-
-a new line of text
+SOMETHING NEW IN HERE
+=====================
+SOMETHING NEW IN HERE
 
diff --git a/third.file b/third.file
@@ -0,0 +1,4 @@
+this is the third file
+
+here is a line of text
+

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +this is the third file
++
 +here is a line of text
++