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
  • #3839
Closed
Open
Issue created Jul 29, 2014 by Bitbucket Importer@bitbucket_importerOwner

DiffMerge on OSX opens DiffMerge, but doesn't load files

Created originally on Bitbucket by waterreaction (Matthew Lai)

I am using thg 3.0.2 on OSX 10.9 with DiffMerge 4.2.0.

My .hgrc looks like this -

#!python

[ui]
username = Matthew Lai <x@x.ca>
merge = diffmerge

[extensions]
hgext.extdiff =

[extdiff]
cmd.diffmerge = /usr/bin/diffmerge

[merge-tools]
diffmerge.executable = /usr/bin/diffmerge
diffmerge.args = --result=$output  $local $base $other
diffmerge.binary = False
diffmerge.symlinks = False
diffmerge.gui = True
diffmerge.premerge = True


[tortoisehg]
vdiff = diffmerge

Running "hg diffmerge" on command line works. But when opened from thg, DiffMerge is opened, but the files aren't loaded.

Someone reported the same bug a while ago, but to a wrong project - https://bitbucket.org/site/master/issue/7754/mac-os-x-port-tortoisehg-opens-diffmerge

Thanks!

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