git-json-merge. A git merge driver that use xdiff to automatically resolve merge conflicts in json files. This project was inspired by git-po-merge.