Merge branch 'rs/merge-add-strategies-simplification' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Sep 2016 04:35:58 +0000 (21:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Sep 2016 04:35:58 +0000 (21:35 -0700)
commit24c88ad...d10c36f4cd2473e6199f901ac485d74e
treea3282fa...01d31149bd9b34ccfb0951e9c7c8c342copy hash to clipboard (tree)
parenta75341c...5aff04a9be8c315b0520db3ff40cd9d5copy hash to clipboard (diff)
parent02a8cfa...78bcc5da72be549a2fbcae2f37bac1cdcopy hash to clipboard (diff)