Funny markers in 'git log -p' output

I did a 'git log -p ..origin/xxxx' and got markers such as: '-<<<<<<< Updated upstream' and '->>>>>>> Stashed changes', what does it mean and where is it expla开发者_如何转开发ined?

git log -p will simply show the log and prints the patch between two versions.

<<<<<<<, ======== and >>>>>>>>>> are conflict markers, used to highlight textual conflicts to users when merging or applying a stash

see the man page for git-merge for examples