Skip to content

GitLab

  • Menu
Projects Groups Snippets
    • Loading...
  • 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 835
    • Issues 835
    • List
    • Boards
    • Service Desk
    • Milestones
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar

This instance will be upgraded to Heptapod 0.31.0 (final) on 2022-05-24 at 14:00 UTC+2 (a few minutes of down time)

  • mercurial
  • TortoiseHg
  • thgthg
  • Issues
  • #1385

Closed
Open
Created Nov 07, 2011 by Bitbucket Importer@bitbucket_importerOwner

3-way merge behaviour differs between dialogs

Created originally on Bitbucket by kisielk (Kamil Kisiel)

I'm using diffuse as a merge tool with the following configuration:

{{{ [merge-tools] diffuse.executable = diffuse diffuse.args=$local $base $other diffuse.gui=True diffuse.diffargs=$parent $child diffuse.diff3args=$parent1 $child $parent2 diffuse.dirdiff=False }}}

This is based on the example in the thg source repository.

When performing a merge between two revisions and going in to conflict resolution, the order of the files in diffuses seems to be: local, parent1, parent2. However, if I cancel out of the merge resolution dialog and leave the changes unresolved, then double-click an unresolved file, it appears that diffuse opens up the files in the order parent1, local, parent2.

The only explanation I can think of is that one of them uses diffuse.args as the arguments whereas the other uses diffuse.diff3args. In any case, it's extremely confusing.

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