Test of Markdown

index.md

Git's Markup of Conflicted Files

Git uses special markers to indicate the start and end of the conflicted area:

<<<<<<< HEAD

and:

=======

as the separator between the changes in the current and the other branch.

>>>>>>> branch-name

shows the end of the changes in the other branch.