Yeah, like I mentioned, this hasn't been maintained in git ubuntu previously, and is against Debian's upstream git repo. Thus the messy diff.
However, I think I might know how to make `git ubuntu merge` to work against arbitrary git repos like this. (Either it'll work and we can maintain php-defaults via git ubuntu, or it won't work and I'll have a devel task for git ubuntu.)
Yeah, like I mentioned, this hasn't been maintained in git ubuntu previously, and is against Debian's upstream git repo. Thus the messy diff.
However, I think I might know how to make `git ubuntu merge` to work against arbitrary git repos like this. (Either it'll work and we can maintain php-defaults via git ubuntu, or it won't work and I'll have a devel task for git ubuntu.)