| commit | b32d7c524b2a0e404c297609aea6ec1cf9f889fe | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 12 Aug 2016 16:47:36 +0000 (12 09:47 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 12 Aug 2016 16:47:36 +0000 (12 09:47 -0700) | ||
| tree | 28bb1e544377460af8cc50ef240afca838257aea | treesnapshot (tar.gz zip) |
| parent | 18f3ce8841b1cf7a3bee8e8da75fd7520060a4c0 | commitdiff |
| parent | 02a8cfa478bcc5da72be549a2fbcae2f37bac1cd | commitdiff |
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()
A small code clean-up.
* rs/merge-add-strategies-simplification:
merge: use string_list_split() in add_strategies()
| builtin/merge.c | diff1 | diff2 | blobhistory |