- Use both versions.
@@ -8,3 +8,5 @@ Do merge:
$ git merge FROM
Beware of conflicts! :)
+
+Fear the merge!