-
We were incorrectly using the loaded file, but Meld's conflict resolution code always sets a merge-output file. Until recently these always happened to be the same, but the new git merge changes made this no longer the case.
488f80dd
We were incorrectly using the loaded file, but Meld's conflict resolution code always sets a merge-output file. Until recently these always happened to be the same, but the new git merge changes made this no longer the case.