git merge tool

$ sudo apt-get install meld
$ git config -global merge.tool meld
$ git merge [Other branch to merge]
$ git mergetool