Merge branch 'rs/logical-vs-binary-or'
authorJunio C Hamano <gitster@pobox.com>
Thu, 20 Jun 2013 23:02:38 +0000 (16:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 20 Jun 2013 23:02:39 +0000 (16:02 -0700)
Code cleanup.

* rs/logical-vs-binary-or:
use logical OR (||) instead of binary OR (|) in logical context

Trivial merge