Commit 488f80dd authored by Andrew Sutherland's avatar Andrew Sutherland 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.
parent a6befc98
......@@ -850,7 +850,8 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
messagetype=Gtk.MessageType.QUESTION)
if resolve_response == Gtk.ResponseType.OK:
conflict_file = self.textbuffer[1].data.filename
bufdata = self.textbuffer[1].data
conflict_file = bufdata.savefile or bufdata.filename
parent.command('resolve', [conflict_file])
return response
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment