Merge branch 'rs/merge-microcleanup'

Code clean-up. * rs/merge-microcleanup: merge: use skip_prefix()

Junio C Hamano committed Aug 22, 2017 at 10:29 UTC e2a2a1daacb43d8296baf155ae6ea0ec6e2f2b8d

No changes.