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 /git-merge-resolve.sh | |
| parent | Merge branch 'rs/child-process-init' (diff) | |
| parent | merge: use string_list_split() in add_strategies() (diff) | |
| download | tgif-b32d7c524b2a0e404c297609aea6ec1cf9f889fe.tar.xz | |
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 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions