New GitMergeTool + IdentityKeys for ssh

2016-10-30 00:09:14 +02:00 · 2016-10-30 00:09:14 +02:00 · 45a61379dc
parent fec8135663
commit 45a61379dc
1 changed files with 2 additions and 0 deletions
--- a/git/gitconfig
+++ b/git/gitconfig
@ -12,3 +12,5 @@
 	excludesfile = ~/.gitignore_global
 [color]
 	ui = auto
+[merge]
+	conflictstyle = diff3