Git show conflicts alias
Git always use patience as algorithm, update difftool settings