On Dec 9, 2015 7:49 AM, "FLORENT Philippe" <[email protected]> wrote: > > Hello, > > > > Is there an alternative to tortoise built in merge tool ? > >
Are you talking about kdiff3? I'm pretty sure that's what TortoiseHg comes bundled with, these days. It's one of the best out there. But sure, there are alternatives. Search the web for "3-way merge tool". > > because it is a pain to use and even when I think it is ok, it duplicates parts of the code > > In the decade or so I've been using kdiff3, I've never had that problem. Can you give an example? > > I am looking for something clear to use and that don’t add an extra 3rd text window that seems to come from nowhere > Um, do you mean the "base" file? As in, the common ancestor of the two versions of the file you're merging? That's kind of an essential part of doing easy merges in any revision control system, even SVN. Without it, automatic merges are not really possible. > Also if it could display the different branch names that would allow users not to try figure out which code belongs to who for 5 min > > > Yeah that would be useful, I'd be interested in that as well.
------------------------------------------------------------------------------
_______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
