diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-05-18 14:40:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-18 14:40:12 -0700 |
| commit | 87c594471d3ee696b0137a851385f091e623b00c (patch) | |
| tree | 996bcc95b6483c1cce1402bf4ced6b174d2b676c /git-merge-resolve.sh | |
| parent | Merge branch 'jk/fix-attribute-macro-in-2.5' into HEAD (diff) | |
| parent | string_list: use string-list API in unsorted_string_list_lookup() (diff) | |
| download | tgif-87c594471d3ee696b0137a851385f091e623b00c.tar.xz | |
Merge branch 'rt/string-list-lookup-cleanup' into HEAD
Code cleanup.
* rt/string-list-lookup-cleanup:
string_list: use string-list API in unsorted_string_list_lookup()
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions