Git is a distributed version control system.
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.
no ff
vim vim 
<<<<<<< HEAD
what are you doing ?
这个是VI编辑器么,和VIM是一样的用法!
=======

>>>>>>> dev