A test commit on branch iss01 with a new file
A test commit on branch master for a merging conflict
Merge commit