1. Andreas Stark
  2. Mercurial LabVIEW Integration
Issue #15 new

allow use of text-based diff/merge tool too

Jon Daniels
created an issue

I had problems when I had text files together with LabView in the same repository, because TortoiseHg wanted to diff/merge the text files with LVMerge and lvdiff tools.

I fixed the problem at least for diff (haven't been able to confirm merge) by adding some fall-through lines to the mercurial.ini file. Attached is my edited .ini file which seems to resolve the problem. Only change was the last line of each of [merge-tools], [merge-patterns], and [diff-patterns].

Comments (2)

  1. Log in to comment