diff options
| author | Thomas Schneider <qsx@chaotikum.eu> | 2026-07-27 19:22:34 +0200 |
|---|---|---|
| committer | Thomas Schneider <qsx@chaotikum.eu> | 2026-07-27 20:02:40 +0200 |
| commit | 157ce51fb80574e38723d0b7a144fc6908f8a433 (patch) | |
| tree | b578687dc58f46367e2423c9e568e72a5e6afc66 /dot.gitconfig | |
| parent | e5257f257d77a8b5374d886066c4d6e3a4c8b0bf (diff) | |
Git: Use `git-delta` (somewhat) optionally
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 |