git: diffstyle angepasst
This commit is contained in:
parent
70b534ac78
commit
44119f93ce
1 changed files with 2 additions and 0 deletions
|
@ -10,3 +10,5 @@
|
||||||
editor = vim
|
editor = vim
|
||||||
[help]
|
[help]
|
||||||
autocorrect = 20 # https://opensource.com/article/20/11/git-aliases
|
autocorrect = 20 # https://opensource.com/article/20/11/git-aliases
|
||||||
|
[merge]
|
||||||
|
conflictStyle = diff3
|
||||||
|
|
Loading…
Reference in a new issue