| commit | a46af5946c3ec125e0c2fee889610485eb4a6e14 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 21 Oct 2014 20:28:42 +0000 (21 13:28 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 21 Oct 2014 20:28:42 +0000 (21 13:28 -0700) | ||
| tree | 3ed40836fea576ca667c5704412122780437e2c4 | treesnapshot (tar.gz zip) |
| parent | e96e98b3399ae4c638466f84068fe94d4712c5a3 | commitdiff |
| parent | 688684eba436c021eaddab1725093bb953cf260d | commitdiff |
Merge branch 'da/mergetool-temporary-directory'
Allow a temporary directory specified to be used while running "git
mergetool" backend.
* da/mergetool-temporary-directory:
t7610-mergetool: add test cases for mergetool.writeToTemp
mergetool: add an option for writing to a temporary directory
Allow a temporary directory specified to be used while running "git
mergetool" backend.
* da/mergetool-temporary-directory:
t7610-mergetool: add test cases for mergetool.writeToTemp
mergetool: add an option for writing to a temporary directory
| Documentation/config.txt | diff1 | diff2 | blobhistory |
| git-mergetool.sh | diff1 | diff2 | blobhistory |
| t/t7610-mergetool.sh | diff1 | diff2 | blobhistory |