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. ------------------------------------------------------------------------------ _______________________________________________ Tortoisehg-develop mailing list Tortoisehg-develop@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
