Description
When using the (e)dit feature of the interactive conflict resolver, it suuuuuure would be nice if the temporary file loaded into the editor had a name somewhat resembled the name of the working copy file whose conflicts I'm resolving. "tempfile.5.tmp" is ... not so helpful.