Jump to content

smhillary

Members
  • Content Count

    2
  • Joined

  • Last visited

  • Days Won

    1

smhillary last won the day on November 10 2013

smhillary had the most liked content!

Community Reputation

1 Neutral

About smhillary

  • Rank
    Newbie
  1. I have set up mercurial to use SemanticMerge for my diff and merge tool as per the instructions here: http://www.semanticmerge.com/documents/SemanticMerge-Mercurial.pdf . I can merge files ok but if I try and "diff to parent" for a class (from TortoiseHg workbench) a SemanticMerge menu appears displaying merge and diff options. Using Process Explorer shows that no arguments were passed to SemanticMerge when it started. I have consulted the documentation for extdiff here http://mercurial.selenic.com/wiki/ExtdiffExtension and I cannot see how SemanticMerge should be setup in the mercurial.ini. I am using TortoiseHg 2.8.2, Mercurial 2.6.3 and SemanticMerge 0.9.34
×
×
  • Create New...