Git is a version control syste.测试diff命令1
Git is free software distributed under the GPL.
Test git.
测试diff命令2
Git has a mutable index called stage.
Git tracks changes of files.
第一次add
第二次修改后commit
<<<<<<< HEAD
Creating a new branch is quick & simple.
=======
Creating a new branch is quick.
Creating a new branch is quick AND simple.
>>>>>>> featurel