Commit 488f80dd authored by Committed by Kai Willadsen
filediff: Make conflict resolution prompt use correct path (bgo#756148)
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.
Showing with 2 additions and 1 deletion