hello huangshan

Git is distributed version control system

Git is free software

Git is free software distributed under the GPL

Git has a mutanle index called stage

Git tracks changes

Creating a new branch is quick

<<<<<<< HEAD
Creating a new branch is quick & simple
=======
Creating a new branch is quick AND simple
>>>>>>> feature1

This is a test