diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-09 22:25:35 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-09 22:25:35 (GMT) |
| commit | 2950cbd4999e230c985be9f2b40cc0bf787fbdd3 (patch) | |
| tree | 59e57aa1f93cd5339052339baf1bf0d077972a43 /contrib/completion | |
| parent | 069874c8e7896f94c6ebd05e437775e45c32caf2 (diff) | |
| parent | 7e6d6f7610965906d071022615bf64f14c60c0d2 (diff) | |
| download | git-2950cbd4999e230c985be9f2b40cc0bf787fbdd3.zip git-2950cbd4999e230c985be9f2b40cc0bf787fbdd3.tar.gz git-2950cbd4999e230c985be9f2b40cc0bf787fbdd3.tar.bz2 | |
Merge branch 'js/mergetool-optim'
"git mergetool" and its tests now spawn fewer subprocesses.
* js/mergetool-optim:
mergetool: use shell variable magic instead of `awk`
mergetool: dissect strings with shell variable magic instead of `expr`
t7610-mergetool: use test_cmp instead of test $(cat file) = $txt
t7610-mergetool: do not place pipelines headed by `yes` in subshells
Diffstat (limited to 'contrib/completion')
0 files changed, 0 insertions, 0 deletions