changed stuff

gitconfig

@@ -1,6 +1,21 @@
 [user]
 	name = Vasili Svirydau
-	email = vasili.svirydau@move.com
+	email = vsviridov@exceede.com
 
 [push]
     default = simple
+[difftool "bcompare-mac"]
+    cmd = "\"/Applications/Beyond Compare 2.app/Contents/MacOS/bcompare"\"
+[mergetool "bcompare-mac"]
+    cmd = "\"/Applications/Beyond Compare 2.app/Contents/MacOS/bcompare\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""
+    trustExitCode = true
+
+[difftool "sourcetree"]
+	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
+    # path =
+[mergetool "sourcetree"]
+	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+	trustExitCode = true
+
+[core]
+	editor = /usr/bin/vim