contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"
authorElia Pinto <gitter.spiros@gmail.com>
Fri, 6 Jun 2014 14:55:49 +0000 (07:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Jun 2014 21:47:06 +0000 (14:47 -0700)
commit6f34b79...e15f92b53d050598b04444e8421d7b7d
tree43fdf79...66ce80315defab02b1afb9d1caaa162bcopy hash to clipboard (tree)
parentcd4de93...2e34ded30bd6b7a7352b45650ad81a83copy hash to clipboard (diff)
contrib/examples/git-resolve.sh