From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Jul 2013 17:42:18 +0000 (-0700)
Subject: Merge branch 'rs/logical-vs-binary-or' into maint
X-Git-Tag: v1.8.3.4~25
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/52c19991cb86c81068c2ac7d8164643d8593bb50?hp=--cc

Merge branch 'rs/logical-vs-binary-or' into maint

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

52c19991cb86c81068c2ac7d8164643d8593bb50