diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-04-06 14:50:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-06 14:50:46 -0700 |
| commit | ae722b4e2796522261b0f130eb86b665499625e6 (patch) | |
| tree | 95dc131c0b1e306b7f1206f1ea3e179547290171 /git-gui | |
| parent | Merge branch 'jc/conflict-marker-size' (diff) | |
| parent | fmt-merge-msg: hide summary option (diff) | |
| download | tgif-ae722b4e2796522261b0f130eb86b665499625e6.tar.xz | |
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
Diffstat (limited to 'git-gui')
0 files changed, 0 insertions, 0 deletions