kdiff3 as a default merge and diff tool on all platforms now
This commit is contained in:
parent
17b5fab08d
commit
415faed70e
1 changed files with 10 additions and 0 deletions
|
@ -11,5 +11,15 @@
|
|||
pager = cat
|
||||
[alias]
|
||||
tree = log --show-signature --color --decorate --date=short --all --graph -n 9
|
||||
[core]
|
||||
autocrlf = false
|
||||
|
||||
|
||||
[diff]
|
||||
tool = kdiff3
|
||||
[difftool]
|
||||
prompt = false
|
||||
[merge]
|
||||
tool = kdiff3
|
||||
[mergetool]
|
||||
keepBackup = false
|
||||
|
|
Loading…
Reference in a new issue