Changing the conflict markers with diff3

[Yannick Gingras]

Hi, 
  I'm not sure if this is the right place to ask but it's the only
contact on the diffutils page.  I have an application that calls
diff3 a lot on text in Markdown and AsciiDoc format.  In those markup
languages, "======" is used to specify headings.  After a merge with
conflict, I don't want to let the user save until the conflict is
resolved and I detect that with the presence of conflict markers.
Obviously, I have a problem with "======".

Is it possible to tell diff3 to use alternate conflict markers?

The application is Gazest, a wiki I'm working on:

  http://ygingras.net/gazest

Thanks for your time,

-- 
Yannick Gingras