/shimmy

Git is a version control system.
Git is free software
Git is a distributed version control system.
in dev branch add a line

-----------====
in master branch add conflict one; 
\\\\\\\\\\\\
in dev branch add a conflict two; 


健健康康快快