1 files changed, 3 insertions, 1 deletions

diff --git a/.gitconfig b/.gitconfig
index 22b054f..6e2b555 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -24,7 +24,7 @@
 	p = push --follow-tags
 	dw = diff --color-words
 [merge]
-	tool = vimdiff
+	tool = kdiff3
 	conflictstyle = diff3
 [push]
 	default = current
@@ -59,3 +59,5 @@
 	show = /usr/share/git/diff-highlight/diff-highlight | less
 [grep]
 	lineNumber = true
+[tag]
+	sort = version:refname