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

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

1  2 
apply.c
diff --cc apply.c
Simple merge