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.
Git is OK.
<<<<<<< HEAD
<<<<<<< HEAD
AAAAAA
=======
Creating a new branch is quick & simple.
=======
Creating a new branch is quick AND simple.
BBBBB
<<<<<<< HEAD
=======
>>>>>>> b3f709e... fix bug 101
>>>>>>> dev