contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"