Reported by Unknown User, Mar 4, 2006

(This entry was imported from the savannah tracker, original 
location: https://savannah.nongnu.org/bugs/index.php?15985)

Some issues now:
  -- we don't check for failures in the merge command we call
     (this used to be because xxdiff gave weird error codes, but
     that has been fixed in mainline by passing xxdiff the
     "give sane error codes" switch).
  -- we should not attempt graphical mergers when there is no
     GUI running; I think "gui running" is best defined as
     "on win32, or os x, or DISPLAY is set"
  -- users should be able to choose which merger to use more
     sanely.