Visual Merge

[RichardGeigerrmg at netapp.com]

Wes Peters writes:

> I haven't yet figured out how to call it from a command line, but GNU
> Emacs has a nice (for emacs users, at least) diff/merge tool called
> Ediff.  GNU Emacs is available for NT, and I believe the NT version will
> run on 95 as well.  It's available from somewhere in the washington.edu
> domain; I'm sure Alta Vista or InfoSeek can find it for you.

> Wes Peters                                                       Softweyr LLC
> http://www.xmission.com/~softweyr                       softweyr at xmission.com

Something along the lines of:

  % cat /usr/local/bin/merge_emacs
  #!/bin/sh
  #   base theirs yours result
  emacs --eval '(emerge-files-with-ancestor 0 "'$2'" "'$3'" "'$1'" "'$4'")'