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)
Code clean-up.

* rs/merge-microcleanup:
merge: use skip_prefix()

1  2 
builtin/merge.c
diff --cc builtin/merge.c
Simple merge