On Wed, May 5, 2010 at 7:31 PM, Neal Becker <ndbeck...@gmail.com> wrote: > I did sync to pull in changes from another repo, and this caused merge > conflicts, which invoked kdiff3. So far so good. Only 1 problem. It calls > the versions 'base', 'parent1' and 'parent2'. I can't tell which versions > are coming from where. Don't suppose there's any way to improve this? > > I just pulled up emacs and figured out which files were which in this case, > but I couldn't resolve it just using hgtk.
When merging kdiff3 is launched directly from Mercurial source, so hgtk has no control over it. You can pick any three labels you want for base, parent1 and parent2, those are defined in kdiff3.args in mergetools.rc, but Mercurial does not support the same depth of variable expansion in the launch arguments as hgtk does for visual diffs. -- Steve Borho ------------------------------------------------------------------------------ _______________________________________________ Tortoisehg-develop mailing list Tortoisehg-develop@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
