From 157ce51fb80574e38723d0b7a144fc6908f8a433 Mon Sep 17 00:00:00 2001 From: Thomas Schneider Date: Mon, 27 Jul 2026 19:22:34 +0200 Subject: Git: Use `git-delta` (somewhat) optionally --- dot.gitconfig | 3 +++ 1 file changed, 3 insertions(+) (limited to 'dot.gitconfig') diff --git a/dot.gitconfig b/dot.gitconfig index 115e630..29a452c 100644 --- a/dot.gitconfig +++ b/dot.gitconfig @@ -1,5 +1,6 @@ [include] path = ~/.dotfiles/grml-etc-core/etc/skel/.gitconfig + path = .gitconfig.delta [user] email = qsx@chaotikum.eu name = Thomas Schneider @@ -23,3 +24,5 @@ bcc = fcc-sent@qsuscs.de [init] defaultBranch = main +[merge] + conflictStyle = diff3 -- cgit v1.2.3