]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 069874c 7e6d6f7)
Merge branch 'js/mergetool-optim'
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Jul 2019 22:25:35 +0000 (15:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Jul 2019 22:25:35 +0000 (15:25 -0700)
commit2950cbd4999e230c985be9f2b40cc0bf787fbdd3
tree59e57aa1f93cd5339052339baf1bf0d077972a43tree | snapshot
parent069874c8e7896f94c6ebd05e437775e45c32caf2commit | diff
parent7e6d6f7610965906d071022615bf64f14c60c0d2commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.