From: Junio C Hamano Date: Thu, 20 Jun 2013 23:02:38 +0000 (-0700) Subject: Merge branch 'rs/logical-vs-binary-or' X-Git-Tag: v1.8.4-rc0~157 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=02dfccfa407032b8d5aa4d883ba986ef10775a50;p=thirdparty%2Fgit.git Merge branch 'rs/logical-vs-binary-or' Code cleanup. * rs/logical-vs-binary-or: use logical OR (||) instead of binary OR (|) in logical context --- 02dfccfa407032b8d5aa4d883ba986ef10775a50