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 838
    • Issues 838
    • 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
  • mercurialmercurial
  • TortoiseHgTortoiseHg
  • thgthg
  • Issues
  • #4974
Closed
Open
Issue created Dec 14, 2017 by Bitbucket Importer@bitbucket_importerOwner

meld-auto meld-noauto

Created originally on Bitbucket by daschuer

Like kdiff3 TortoiseHG should support both option for meld

Here is my meld settings for auto merge:

[merge-tools] meld-auto.regkey=SOFTWARE\Meld meld-auto.regkeyalt=SOFTWARE\Wow6432Node\Meld meld-auto.regname=Executable meld-auto.gui=True meld-auto.priority=-2 meld-auto.args=$local $base $other --auto-merge -o $output meld-auto.checkchanged=True meld-auto.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child meld-auto.diff3args=-a --label='$plabel1' $parent1 --label='$clabel' $child --label='$plabel2' $parent2 meld-auto.dirdiff=True

This should also be considered together with Issue #4973 (closed) Auto should use the merge tool merging features. nonauto should allow to continue a mercurial merged file.

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