From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 6 Apr 2010 21:50:46 +0000 (-0700)
Subject: Merge branch 'sb/fmt-merge-msg'
X-Git-Tag: v1.7.1-rc0~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ae722b4e2796522261b0f130eb86b665499625e6;p=git.git

Merge branch 'sb/fmt-merge-msg'

* sb/fmt-merge-msg:
  fmt-merge-msg: hide summary option
  fmt-merge-msg: remove custom string_list implementation
  string-list: add unsorted_string_list_lookup()
  fmt-merge-msg: use pretty.c routines
  t6200: test fmt-merge-msg more
  t6200: modernize with test_tick
  fmt-merge-msg: be quiet if nothing to merge
---

ae722b4e2796522261b0f130eb86b665499625e6