From: Elia Pinto Date: Tue, 20 May 2014 13:50:19 GMT Subject: [PATCH 06/19] contrib/examples/git-resolve.sh: convert test -a/-o to && and || Message-ID: <1400593832-6510-7-git-send-email-gitter.spiros@gmail.com> In-Reply-To: <1400593832-6510-1-git-send-email-gitter.spiros@gmail.com> The interaction with unary operators and operator precedence for && and || are better known than -a and -o, and for that reason we prefer them. Replace all existing instances of -a and -o to save readers from the burden of thinking about such things. Signed-off-by: Elia Pinto --- contrib/examples/git-resolve.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/examples/git-resolve.sh b/contrib/examples/git-resolve.sh index 48d0fc9..70fdc27 100755 --- a/contrib/examples/git-resolve.sh +++ b/contrib/examples/git-resolve.sh @@ -76,7 +76,7 @@ case "$common" in 2>/dev/null || continue # Count the paths that are unmerged. cnt=$(GIT_INDEX_FILE=$G git ls-files --unmerged | wc -l) - if test $best_cnt -le 0 -o $cnt -le $best_cnt + if test $best_cnt -le 0 || test $cnt -le $best_cnt then best=$c best_cnt=$cnt -- 1.7.10.4