evolve: use better words in conflict markers of `hg evolve` Though we call merge.graft internally, we still have the functionality to pass the words we want to show up in conflict markers. So let's use better words here.

test-drop.t
test-inhibit.t
test-simple4server.t
tests/test-simple4server-bundle2.t