From: Junio C Hamano Date: Tue, 21 Oct 2014 20:28:19 +0000 (-0700) Subject: Merge branch 'da/mergetool-temporary-filename' X-Git-Tag: v2.2.0-rc0~30 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/02f4db83bd979fe33f18006fa612d7d5ab1d2470 Merge branch 'da/mergetool-temporary-filename' Tweak the names of the three throw-away files "git mergetool" comes up with to feed the merge tool backend, so that a file with a single dot in its name in the original (e.g. "hello.c") will have only one dot in these variants (e.g. "hello_BASE_4321.c"). * da/mergetool-temporary-filename: mergetool: use more conservative temporary filenames --- 02f4db83bd979fe33f18006fa612d7d5ab1d2470