武翔 / git

Go to a project
Toggle navigation Toggle navigation pinning
武翔
1cda07a0 2 parents 681804b0 4fa0623a

conflict fixed

Inline Side-by-side
Showing 1 changed file with 2 additions and 1 deletions
...@@ -2,4 +2,5 @@ git is a distributed version control system. ...@@ -2,4 +2,5 @@ git is a distributed version control system.
2 git is free software distributed under the GPL. 2 git is free software distributed under the GPL.
3 git has a mutable index called stage. 3 git has a mutable index called stage.
4 git tracks changes of files. 4 git tracks changes of files.
5 -creating a new branch is quick & simple. 5 +<<<<<<< HEAD
6 +creating a new branch is quick and simple.
......