Merge branch 'sb/merge-recursive-copy-paste-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 Sep 2014 05:17:21 +0000 (22:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Sep 2014 05:17:22 +0000 (22:17 -0700)
commitab9bc95...537187fc39465bca1d40438b2e2ee6b5
treefb3b3f7...1b672329d2c65aadd1781a264b41ca7acopy hash to clipboard (tree)
parent131f031...c46c30d5a9e6743354808230cf4908c0copy hash to clipboard (diff)
parent040b2ac...78366215bfc27be5e110a2f0170e6864copy hash to clipboard (diff)
merge-recursive.c