From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 Jul 2014 21:21:05 +0000 (-0700)
Subject: Merge branch 'ep/avoid-test-a-o'
X-Git-Tag: v2.1.0-rc1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b0c0e35dd2ebdab3fed1c6649f74787f7e46327;p=thirdparty%2Fgit.git

Merge branch 'ep/avoid-test-a-o'

* ep/avoid-test-a-o:
  t9814: fix misconversion from test $a -o $b to test $a || test $b
---

4b0c0e35dd2ebdab3fed1c6649f74787f7e46327