1. TortoiseHg
  2. TortoiseHg
  3. thg
  4. Issues
Issue #3316 on hold

Araxis Merge: File always marked as resolved

created an issue

When I merge a file using Araxis Merge as my merge tool, the file is always marked as resolved even though I don't save the result in Araxis Merge.

Comments (5)

  1. Omninet reporter

    When i do that, I get this:

    ** Mercurial version (2.7).  TortoiseHg version (2.9)
    ** Command: --nofork workbench
    ** CWD: D:\Users\kolja\Desktop
    ** Encoding: cp1250
    ** Extensions loaded: graphlog, hgk, highlight, acl, histedit, rebase, transplant, largefiles, mq, convert
    ** Python version: 2.7.3 (default, Apr 10 2012, 23:24:47) [MSC v.1500 64 bit (AMD64)]
    ** Windows version: sys.getwindowsversion(major=6, minor=1, build=7601, platform=2, service_pack='Service Pack 1')
    ** Processor architecture: x64
    ** Qt-4.8.4 PyQt-4.10.2 QScintilla-2.7.2
    Traceback (most recent call last):
      File "tortoisehg\hgqt\thread.pyo", line 222, in interact_handler
    TypeError: 'int' object is not iterable

    Which I think you resolved earlier. Bugfix will be available in the next release?

  2. Log in to comment