Merge branch 'ab/merge-file-prefix' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2015 21:13:10 +0000 (13:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2015 21:13:11 +0000 (13:13 -0800)
commit3336757...b85a115900deac600cc4f8f03ec4754b
tree1bf8567...605c6265bd5d1f43d9bafcf80aac54d4copy hash to clipboard (tree)
parent3630be2...49819b79de917a77c6627e3f84c00a11copy hash to clipboard (diff)
parent204a8ff...67d2b789a34a14a06618a24756f7d9a9copy hash to clipboard (diff)
t/t6023-merge-file.sh