Example of how to configure a custom git merge driver
Geek Repo:Geek Repo
Github PK Tool:Github PK Tool