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

Code cleanup.

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