Merge branch 'nd/remote-plural-ours-plus-theirs' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2016 20:17:18 +0000 (13:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2016 20:17:18 +0000 (13:17 -0700)
commit4e327bb...c251fc642660e35252543c830d2ca2b7
tree8616596...f1af2b431adbd06c51da62f5c4627f48copy hash to clipboard (tree)
parente8c7b8c...683bcaecfca21a9dd7c9464c50b4d1ddcopy hash to clipboard (diff)
parentf54bea4...a58caddaaf83644d95172740e8490206copy hash to clipboard (diff)
remote.c