contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"
commit6f34b79de15f92b53d050598b04444e8421d7b7d
authorElia Pinto <gitter.spiros@gmail.com>
Fri, 6 Jun 2014 14:55:49 +0000 (6 07:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Jun 2014 21:47:06 +0000 (9 14:47 -0700)
tree43fdf79666ce80315defab02b1afb9d1caaa162b
parentcd4de93f2e34ded30bd6b7a7352b45650ad81a83
contrib/examples/git-resolve.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>
contrib/examples/git-resolve.sh