diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-09-25 15:24:06 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-25 15:24:06 +0900 |
| commit | b9db14f52ea40019948d6328f7b6a749840ba284 (patch) | |
| tree | 50d876d69d81a17f472ebe76fca2b838a31aad5e /git-mergetool.sh | |
| parent | Merge branch 'kw/write-index-reduce-alloc' (diff) | |
| parent | subprocess: loudly die when subprocess asks for an unsupported capability (diff) | |
| download | tgif-b9db14f52ea40019948d6328f7b6a749840ba284.tar.xz | |
Merge branch 'cc/subprocess-handshake-missing-capabilities'
Finishing touches to a topic already in 'master'.
* cc/subprocess-handshake-missing-capabilities:
subprocess: loudly die when subprocess asks for an unsupported capability
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions