commit | ae722b4e2796522261b0f130eb86b665499625e6 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Tue Apr 06 14:50:46 2010 -0700 |
committer | Junio C Hamano <gitster@pobox.com> | Tue Apr 06 14:50:46 2010 -0700 |
tree | 95dc131c0b1e306b7f1206f1ea3e179547290171 | |
parent | 3f3f8d9d09cdb6810e848d82583749e6080d2167 [diff] | |
parent | 63e671508782ca2dd386e5878d3682090fd64eda [diff] |
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