Console Output

+ git log --oneline -n 5
5dd22ce conflict resolved
5ec9884 conflict resolve
e5c2713 master
644af33 new-release
7a2cd46 Merge branch 'new-release' into 'master'