In git, you could do this with a custom merge driver: https://github.com/Praqma/git-merge-driver https://github.com/Praqma/git-merge-driver No need to put that

In git, you could do this with a custom merge driver: https://github.com/Praqma/git-merge-driver https://github.com/Praqma/git-merge-driver No need to put that sort of thing in core.