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.