own diff/mergetool
Git merge with git-crypt
Creating your own git mergetool
Git Smudge and Clean Filters: Making Changes So You Don’t Have To
gitattributes
8.2 Customizing Git - Git Attributes