Merge branch 'rs/logical-vs-binary-or' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Jul 2013 17:42:18 +0000 (10:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Jul 2013 17:42:18 +0000 (10:42 -0700)
commit52c19991cb86c81068c2ac7d8164643d8593bb50
tree015532c81a0eed78df8838e3d9e70804cf4ec83d
parent6ddc862e8bcf8c687a6fcf2a805ccb032b5d3e7f
parent0b437a18bdd188794cec8855e2a413921d08b6e8
Merge branch 'rs/logical-vs-binary-or' into maint

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