| commit | 02f4db83bd979fe33f18006fa612d7d5ab1d2470 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 21 Oct 2014 20:28:19 +0000 (21 13:28 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 21 Oct 2014 20:28:20 +0000 (21 13:28 -0700) | ||
| tree | b46eec9e6a6c9045c6a5819460d495f5519af6f4 | treesnapshot (tar.gz zip) |
| parent | 64bff25f78da5ae2e64f0598df20370c45aad7ef | commitdiff |
| parent | eab335c46d6677ff50e9fe94352150641bc05507 | commitdiff |
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
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
| git-mergetool.sh | diff1 | diff2 | blobhistory |