diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-10-21 13:28:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-21 13:28:42 -0700 |
| commit | a46af5946c3ec125e0c2fee889610485eb4a6e14 (patch) | |
| tree | 3ed40836fea576ca667c5704412122780437e2c4 /parse-options.c | |
| parent | e96e98b3399ae4c638466f84068fe94d4712c5a3 (diff) | |
| parent | 688684eba436c021eaddab1725093bb953cf260d (diff) | |
| download | git-a46af5946c3ec125e0c2fee889610485eb4a6e14.tar.gz | |
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
Diffstat (limited to 'parse-options.c')
0 files changed, 0 insertions, 0 deletions