| commit | 1cb493739540bd196848a59f9b7765b0622f725c | |
| author | Elia Pinto <gitter.spiros@gmail.com> | |
| Fri, 6 Jun 2014 14:55:51 +0000 (6 07:55 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 9 Jun 2014 21:47:07 +0000 (9 14:47 -0700) | ||
| tree | 8430f4216cb730e1d4bd7012f08b5d39715888de | treesnapshot (tar.gz zip) |
| parent | c82af12a1bde56fd7c3b984688ef7fe9f4c44b6e | commitdiff |
git-mergetool.sh: avoid "test <cond> -a/-o <cond>"
The construct is error-prone; "test" being built-in in most modern
shells, the reason to avoid "test <cond> && test <cond>" spawning
one extra process by using a single "test <cond> -a <cond>" no
longer exists.
Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The construct is error-prone; "test" being built-in in most modern
shells, the reason to avoid "test <cond> && test <cond>" spawning
one extra process by using a single "test <cond> -a <cond>" no
longer exists.
Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-mergetool.sh | diffblobblamehistory |