Merge branch 'jc/merge-refuse-new-root'
authorJunio C Hamano <gitster@pobox.com>
Fri, 8 Apr 2016 21:29:11 +0000 (14:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 8 Apr 2016 21:29:11 +0000 (14:29 -0700)
commitd04aa7e...4738f90220b9e205326f17938b8f89d4
tree7be435d...616d58dec183f8c6c8f1517819a2a626copy hash to clipboard (tree)
parent72d917a...f9a5123ef7c0d6db306bbc0d385227e2copy hash to clipboard (diff)
parente379fdf...4fee96cd205be83ff4e71699bdc32b18copy hash to clipboard (diff)
builtin/merge.c
t/t5500-fetch-pack.sh
t/t9400-git-cvsserver-server.sh