Merge branch 'rs/logical-vs-binary-or' into next
commit2821441d44d4083cfefede6f5919cd8117adb0d2
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Jun 2013 15:52:43 +0000 (14 08:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Jun 2013 15:52:43 +0000 (14 08:52 -0700)
treef0b30223544c502b9e3146e3386372bcd5ebdc4f
parent19049280f5b982b6b0430c9a3075321af1ac0e85
parent0b437a18bdd188794cec8855e2a413921d08b6e8
Merge branch 'rs/logical-vs-binary-or' into next

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