[PATCH] merge: use original file extension for temporary files

[Yuya Nishihara]

On Wed, 23 Nov 2016 23:47:54 +0100, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1479941258 -3600
> #      Wed Nov 23 23:47:38 2016 +0100
> # Node ID 9cee175ec5a6e2530190a120244c0d210c469dd8
> # Parent  b3808b2f2e8758f5c763344ce4b81dcf723028ae
> merge: use original file extension for temporary files
> 
> Some merge tools (like Araxis?) can pick merge mode based on the file
> extension. That didn't work well when temporary files were given random
> suffixes. It seems to work better when the random part is before the extension.

Makes sense. Queued, thanks.