Merge branch 'jv/merge-nothing-into-void' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 15 Apr 2016 01:57:49 +0000 (18:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 15 Apr 2016 01:57:49 +0000 (18:57 -0700)
commita5953f6...186e72b3fe7b7dc0b2a7cb0f451cf3ef
treeabad8dd...1b590700b28d29973cd05fb2fd9d4894copy hash to clipboard (tree)
parentea7fefb...7b25deb7c0b4da56d95d67116edded48copy hash to clipboard (diff)
parentb84e65d...0929ec1146f54dcf4c9dbf8dc58467d0copy hash to clipboard (diff)
t/t7600-merge.sh