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)
* rs/logical-vs-binary-or:
  use logical OR (||) instead of binary OR (|) in logical context

1  2 
builtin/apply.c

diff --cc builtin/apply.c
Simple merge