merge: use skip_prefix()
authorRené Scharfe <l.s.r@web.de>
Thu, 10 Aug 2017 16:47:55 +0000 (18:47 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Aug 2017 20:57:00 +0000 (13:57 -0700)
commitde3ce21...edb4870b082fab18148f859d2b3c9ae2
tree4391e45...5db9840a5aeab9b35b076f6272bf5cf1copy hash to clipboard (tree)
parent7234152...66e52c7601789f6de822bb39590f0595copy hash to clipboard (diff)
builtin/merge.c