[master] diff?
[master] diff? cherry pick
[master] commit again

[master] commit lola 2

[master] commit lola 3
[master] commit again
Charlene: First commit
new file
Merge branch 'cherry'

Conflicts:
	file1.txt