different diff tools based on file endings

Mads Kiilerich mads at kiilerich.com
Thu Mar 26 07:02:21 CDT 2009


On 03/26/2009 12:55 PM, Peter Arrenbrecht wrote:
> I'd like this, too. Even for meld, which _can_ do tree diffs. The
> reason is to show the tree diff, Hg sets it up with two temp dirs
> holding only the differing files. This means I cannot use it to
> selectively undo changes against the real file in the working copy
> with ease.
>    

Actually you _can_ edit the files in the temp dirs; extdiff will copy 
any changed files back to the working directory.

(But note http://www.selenic.com/mercurial/bts/issue1562)

I _always_ run "hg extdiff -p meld" and review and make minor edits 
before committing.

/Mads


More information about the Mercurial mailing list