diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 603a4d6..2153d96 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -4,13 +4,13 @@
 	name = Marcus Bengtsson
 	email = marcus.bengtsson@cactusrail.se
 [diff]
-  tool = kdiff3
+	tool = bc3
 [difftool]
   prompt = false
 [merge]
-	tool = kdiff3
+	tool = bc3
 [init]
-	templatedir = ~/.git_template
+	templatedir = /home/vagrant/.git_template
 [alias]
 	tree = log --oneline --decorate --all --graph
 	pulls = !git pull && git submodule init && git submodule update && git submodule status
@@ -18,3 +18,7 @@
 	submodulesummary = true
 [push]
 	default = simple
+[difftool "bc3"]
+	trustExitCode = true
+[mergetool "bc3"]
+	trustExitCode = true

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 603a4d6..2153d96 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -4,13 +4,13 @@
 	name = Marcus Bengtsson
 	email = marcus.bengtsson@cactusrail.se
 [diff]
-  tool = kdiff3
+	tool = bc3
 [difftool]
   prompt = false
 [merge]
-	tool = kdiff3
+	tool = bc3
 [init]
-	templatedir = ~/.git_template
+	templatedir = /home/vagrant/.git_template
 [alias]
 	tree = log --oneline --decorate --all --graph
 	pulls = !git pull && git submodule init && git submodule update && git submodule status
@@ -18,3 +18,7 @@
 	submodulesummary = true
 [push]
 	default = simple
+[difftool "bc3"]
+	trustExitCode = true
+[mergetool "bc3"]
+	trustExitCode = true
diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink
index 1f573e7..eaaeef5 100644
--- a/zsh/zshrc.symlink
+++ b/zsh/zshrc.symlink
@@ -1,5 +1,4 @@
 # .zshrc
-
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return