Merge branch 'rs/merge-microcleanup' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Aug 2017 20:53:00 +0000 (13:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Aug 2017 20:53:00 +0000 (13:53 -0700)
commit79ba7d301d2f2caf9276be7f9501331fb8fe6f50
tree15b66f5d222011b1d432e16b60a91f976ea7f8de
parent77e3d111ef84e6f93427495f6f1d784b52ad08b8
parentde3ce210edb4870b082fab18148f859d2b3c9ae2
Merge branch 'rs/merge-microcleanup' into next

Code clean-up.

* rs/merge-microcleanup:
  merge: use skip_prefix()
builtin/merge.c