From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 9 Jul 2019 22:25:35 +0000 (-0700)
Subject: Merge branch 'js/mergetool-optim'
X-Git-Tag: v2.23.0-rc0~89
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2950cbd4999e230c985be9f2b40cc0bf787fbdd3

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
---

2950cbd4999e230c985be9f2b40cc0bf787fbdd3