| commit | af58873c6a99c288affc73c6950579aca371f346 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Aug 2014 21:09:00 +0000 (25 14:09 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Aug 2014 21:09:00 +0000 (25 14:09 -0700) | ||
| tree | 38f8fabfea395c79ac2932b544e23094ae300717 | treesnapshot (tar.gz zip) |
| parent | 116bac128bb8607c2042fffc8919667bff588344 | commitdiff |
| parent | 7786cc91bb2edb14db56589b9c59f3ee294ac49b | commitdiff |
Merge branch 'rr/mergetool-temporary-filename-tweak' into pu
* rr/mergetool-temporary-filename-tweak:
Allow the user to change the temporary file name for mergetool
* rr/mergetool-temporary-filename-tweak:
Allow the user to change the temporary file name for mergetool
| Documentation/config.txt | diff1 | diff2 | blobhistory |
| Documentation/git-mergetool.txt | diff1 | diff2 | blobhistory |
| git-mergetool.sh | diff1 | diff2 | blobhistory |