diff options
Diffstat (limited to 'dot.gitconfig')
| -rw-r--r-- | dot.gitconfig | 3 |
1 files changed, 3 insertions, 0 deletions
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 |