diff --git a/gitconfig b/gitconfig
index ffc08cd..c0165b1 100644
--- a/gitconfig
+++ b/gitconfig
@@ -17,3 +17,7 @@
     changes = diff --name-status -r
     diffstat = diff --stat -r
     lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
+[merge]
+    tool = bc3
+[mergetool]
+    cmd = /usr/bin/bcompare $LOCAL $REMOTE $BASE $MERGED