Merge branch 'dc/fmt-merge-msg-microcleanup' into maint
commitde55703672ea47893702c0bfaffb4788d2eb3818
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Aug 2017 21:33:52 +0000 (23 14:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Aug 2017 21:33:52 +0000 (23 14:33 -0700)
tree8595e3a0784e47a452de673ecd924a207619bd0c
parentb55b936038ba66233fb765b7b46ed6852dc8fdfb
parentedd64ef4f7f5e90e66210d375fee1b0ae555cb19
Merge branch 'dc/fmt-merge-msg-microcleanup' into maint

Code cleanup.

* dc/fmt-merge-msg-microcleanup:
  fmt-merge-msg: fix coding style
builtin/fmt-merge-msg.c