[issue1063] override hgmerge 3-way merge selection

[Ted Pavlic]

New submission from Ted Pavlic <ted at tedpavlic.com>:

It might be nice if a mechanism was built into the hgmerge script that made it
easier to override the 3-way merge tool choice it used.

I'm on OS/X, and I have kdiff3 and several other merge tools installed.
Additionally, I'm happy to use vim to resolve conflicts. 

Right now, hgmerge throws me into FileMerge all the time, and I need to either
modify hgmerge or get rid of FileMerge to change what hgmerge calls.

----------
messages: 5764
nosy: TedPavlic
priority: wish
status: unread
title: override hgmerge 3-way merge selection

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue1063>
____________________________________________________