Skip to content
GitLab
  • Menu
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 829
    • Issues 829
    • List
    • Boards
    • Service Desk
    • Milestones
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages & Registries
    • Packages & 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
  • mercurial
  • TortoiseHg
  • thgthg
  • Issues
  • #5566
Closed
Open
Created Jul 10, 2020 by alexrayne@alexrayne

thg stable loose kdiff3-noauto resolvers tools

hallow! starts thg stable version 5.4.1+15-ef82204dcd35 with Mercurial-5.4, Python-3.8.3

My working dir in merge state - with merging files.

try to resolve some unresolver file - selects popup menu/start resolve with >

there is a list of resolve tools - in thg5.4.1 windows it have kdiff3-noauto. But in thg from sources there is only kdiff3, kdiff3-noauto looses, i can't resolve file manualy.

Edited Jul 10, 2020 by alexrayne
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
Time tracking