diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-08-12 09:47:36 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-08-12 09:47:36 -0700 |
commit | b32d7c524b2a0e404c297609aea6ec1cf9f889fe (patch) | |
tree | 28bb1e544377460af8cc50ef240afca838257aea /merge-recursive.c | |
parent | 18f3ce8841b1cf7a3bee8e8da75fd7520060a4c0 (diff) | |
parent | 02a8cfa478bcc5da72be549a2fbcae2f37bac1cd (diff) | |
download | git-b32d7c524b2a0e404c297609aea6ec1cf9f889fe.tar.gz |
Merge branch 'rs/merge-add-strategies-simplification'
A small code clean-up.
* rs/merge-add-strategies-simplification:
merge: use string_list_split() in add_strategies()
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions