add merge

readme.txt

@@ -1,3 +1,4 @@
+Edit on dev branch.
 Git is a distributed version control system.
 Git is free software distributed under the GPL.
 Git has a mutable index called stage.