Merge branch 'rs/apply-lose-prefix-length' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Aug 2017 20:52:57 +0000 (13:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Aug 2017 20:52:57 +0000 (13:52 -0700)
commit6ce0dbb3f0ec9ed1bf4e92a34816a5aecd43cd30
treeb9aedafea683b5507315df2eefa338df23804ad6
parentba2afb696a6dcb665324126d268624ef63384ef3
parent881529c84656e7ff41379c0684df0ff9a796d444
Merge branch 'rs/apply-lose-prefix-length' into next

Code clean-up.

* rs/apply-lose-prefix-length:
  apply: remove prefix_length member from apply_state
apply.c