Generate various kinds of Git conflicts, including conflicts suitable to interactively test a merge resolution tool.