Merging with Emacs and ediff-mode

[Giorgos Keramidas]

On Fri, 28 Nov 2008 15:28:10 +0100, Bastian Doetsch <bastian.doetsch at gmx.de> wrote:
> Having an internal merge tool like internal:fail that does a premerge,
> but doesn't launch a merge tool automatically would be nice. Possible
> name: internal:premerge.

Hi Bastian,

It should be possible to do that already, with a merge tool that uses
`premerge' and then launches the `false' utility if the internal
premerge step cannot complete its work without interaction:

  [merge-patterns]
  ** = simplemerge

  [merge-tools]
  simplemerge.priority = 0
  simplemerge.premerge = True
  simplemerge.binary = False
  simplemerge.gui = False
  simplemerge.executable = /usr/bin/false
  simplemerge.args = $local $base $other

It may even be possible to use internal:merge directly with something
like the following, but I haven't tried this:

  [merge-patterns]
  ** = internal:merge

This means that you will always get failed merges when there are any
conflicts though.