Code

Merge branch 'sb/fmt-merge-msg'
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Apr 2010 21:50:46 +0000 (14:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Apr 2010 21:50:46 +0000 (14:50 -0700)
commitae722b4e2796522261b0f130eb86b665499625e6
tree95dc131c0b1e306b7f1206f1ea3e179547290171
parent3f3f8d9d09cdb6810e848d82583749e6080d2167
parent63e671508782ca2dd386e5878d3682090fd64eda
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