Merge branch 'jc/request-pull-show-head-4' into next
commit7e340ff2559327c8b6902f673e7d8c6d8b0c205c
authorJunio C Hamano <gitster@pobox.com>
Sun, 16 Oct 2011 04:00:21 +0000 (15 21:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 16 Oct 2011 04:00:21 +0000 (15 21:00 -0700)
tree4a85c4396ed8a098fc07736d7c7c2b4b9c386803
parentb91c5812e819aca51af2c0611009f305f0a29b4f
parent90a321c04c639488e7f66fa4dd53b14c2363cd70
Merge branch 'jc/request-pull-show-head-4' into next

* jc/request-pull-show-head-4:
  fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse error
builtin/fmt-merge-msg.c