My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 18f3ce8 02a8cfa)
Merge branch 'rs/merge-add-strategies-simplification'
authorJunio C Hamano <gitster@pobox.com>
Fri, 12 Aug 2016 16:47:36 +0000 (09:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Aug 2016 16:47:36 +0000 (09:47 -0700)
A small code clean-up.

* rs/merge-add-strategies-simplification:
  merge: use string_list_split() in add_strategies()

1  2 
builtin/merge.c patch | diff1 | diff2 | blob | history

diff --cc builtin/merge.c
Simple merge
The core git plumbing