tests: add a test demonstrating we still use graft in conflict markers This patch adds a test which shows that we still use the word graft in the conflict markers. Next patch will start using evolve instead of graft.

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