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

Junio C Hamano committed Jul 30, 2014 at 14:21 UTC 4b0c0e35dd2ebdab3fed1c6649f74787f7e46327

No changes.