Painful user experience with 'hg resolve'
Masklinn
masklinn at masklinn.net
Fri Aug 26 13:50:48 CDT 2011
On 2011-08-26, at 20:25 , Isaac Jurado wrote:
> If you use vim, you can configure vimdiff as your merge tool. I guess
> emacs has similar functionality.
The way to do so is even included in the hg wiki[0]. I believe IDEs
also bundle merge tools (pretty sure IntelliJ IDEA and its derivatives
do in any case)
[0] http://mercurial.selenic.com/wiki/MergingWithEmacs
More information about the Mercurial-devel
mailing list