Console Output

+ git log --oneline -n 5
a1b641e conflict resolved
102fa27 Merge branch 'master' into 'new-release'
74e0755 new-release addition
4b83ba3 master addition
5f8bf61 edit 1