Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • thg thg
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 832
    • Issues 832
    • List
    • Boards
    • Service Desk
    • Milestones
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar

April 05-07 - Mercurial Paris Conference 2023 - One day of workshop dedicated to Heptapod and Mercurial usage and workflow. There are still places available for both workshops and talks!

  • mercurialmercurial
  • TortoiseHgTortoiseHg
  • thgthg
  • Issues
  • #3585
Closed
Open
Issue created Jan 31, 2014 by Bitbucket Importer@bitbucket_importerOwner

ValueError by invalid merge-tools priority (Bug when comparing versions)

Created originally on Bitbucket by yuja (Yuya Nishihara)

from wiki page written by @drickert5

#!python
** Mercurial version (2.8.2).  TortoiseHg version (2.10.2)
** Command: 
** CWD: C:\Windows\system32
** Encoding: cp1252
** Extensions loaded: extdiff, rebase
** Python version: 2.7.6 (default, Nov 10 2013, 19:24:24) [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.5 PyQt-4.10.3 QScintilla-2.7.2
Traceback (most recent call last):
  File "tortoisehg\hgqt\wctxactions.pyo", line 203, in runAction
  File "tortoisehg\hgqt\wctxactions.pyo", line 279, in vdiff
  File "tortoisehg\hgqt\visdiff.pyo", line 229, in visualdiff
  File "tortoisehg\hgqt\visdiff.pyo", line 173, in besttool
ValueError: invalid literal for int() with base 10: '-1 kdiff3.args=--L1 base --L2 local --L3 other $base $local $other -o $output'
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
Time tracking