Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'rs/merge-add-strategies-simplification' into maint
author
Junio C Hamano
<gitster@pobox.com>
Fri, 9 Sep 2016 04:35:58 +0000
(21:35 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 9 Sep 2016 04:35:58 +0000
(21:35 -0700)
A small code clean-up.
* rs/merge-add-strategies-simplification:
merge: use string_list_split() in add_strategies()
raw
|
combined
(merge:
a75341c
02a8cfa
)
Trivial merge