Adds emacs to known mergers

[Thomas Arendsen Hein]

* Kevin Smith <yarcs at qualitycode.com> [20050701 01:29]:
> Edouard Gomez wrote:
> >Add emacs knowledge to hgmerge
> 
> If I understand this patch correctly, it will launch emacs if it exists, 
> before tring $EDITOR. As a non-emacs user, I'm not really happy with 
> that. Sure it's on my system, but I don't know how to use it.
> 
> My vote would be not to treat the existence of emacs as evidence that it 
> should be used for merging.

+1

A solution might be to test if "$EDITOR" is some kind of emacs and
only if it is, use it with the correct options.

Thomas

-- 
Email: thomas at intevation.de
http://intevation.de/~thomas/