[email protected] wrote: > One significant problem I am having with TortoiseHg is an inability to view > the common ancestor of a 3-way merge when reviewing merge results. I am > able to see the common ancestor when I perform the merge with a tool like > BeyondCompare 3 (pay version), but when I try to review the merge results > afterwards, I only see the two parents and the child, but the common > ancestor is not available. This makes it very difficult to assess the > correctness of a merge. Something is displayed in the fourth BeyondCompare > panel, but I'm pretty sure that it's not the actual common ancestor file > (based on the invocation command-line parameters). > > The TortoiseHg documentation states that there should be a $ancestor > variable available for diff3args in mercurial.ini. However, this variable > does not get substituted when using it in the diff3args command-line for > reviewing merge results in 2.7.2. Looks like a bug to me, but I thought I'd > get input from this group first. > > Thanks, > > Uli
Anyone tried using emacs ediff for this purpose? Is it any better here? ------------------------------------------------------------------------------ Precog is a next-generation analytics platform capable of advanced analytics on semi-structured data. The platform includes APIs for building apps and a phenomenal toolset for data science. Developers can use our toolset for easy data analysis & visualization. Get a free account! http://www2.precog.com/precogplatform/slashdotnewsletter _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
