Merge branch 'hs/simplify-bit-setting-in-fsck-tree'
commitf7804e250dfceb9695eddc11862054e2f9ca29c7
authorJunio C Hamano <gitster@pobox.com>
Mon, 31 Mar 2014 23:30:44 +0000 (31 16:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Mar 2014 23:30:44 +0000 (31 16:30 -0700)
tree60139d6075a52c654e16bff1e150b62d56cb5b9d
parentfa73d354689aa577d564b03d22f87c34b6288a78
parenteffd12ec876df016d4346fee0d3d6bf31308fa11
Merge branch 'hs/simplify-bit-setting-in-fsck-tree'

* hs/simplify-bit-setting-in-fsck-tree:
  fsck: use bitwise-or assignment operator to set flag
fsck.c