Patch tool completely misplaced a hunk in previous commit