An answer to the request on http://www.selenic.com/mercurial/bts/issue1562 First patch introduce a test of extdiff making temp copies and copying edits back. Please apply this patch now. Second patch shows the _wrong_ behaviour and should probably only be applied together with the fix.