diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-09 15:25:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-09 15:25:35 -0700 |
| commit | 2950cbd4999e230c985be9f2b40cc0bf787fbdd3 (patch) | |
| tree | 59e57aa1f93cd5339052339baf1bf0d077972a43 /commit.c | |
| parent | Merge branch 'mo/hpux-dynpath' (diff) | |
| parent | mergetool: use shell variable magic instead of `awk` (diff) | |
| download | git-2950cbd4999e230c985be9f2b40cc0bf787fbdd3.tar.gz git-2950cbd4999e230c985be9f2b40cc0bf787fbdd3.zip | |
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 'commit.c')
0 files changed, 0 insertions, 0 deletions