merge with no-ff

highgozhangyc · Aug 14, 2017 · 17302c9 · 17302c9
2 parents 48df1fc + 44c1c1c
commit 17302c9
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/readme.txt b/readme.txt
@@ -3,3 +3,4 @@ Git is free software distributed under the GPL.
 Git has a mutable index called stage.
 Git tracks changes of files.
 Creating a new branch is quick and simple.
+add merge