git-apply: handle a patch that touches the same path more than once better