A test repo with a history including a normal non-conflicting merge from a branch to master