linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-20 03:02:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't set merge tool in gitconfig

Browse source 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
This commit is contained in:
Gaetan Semet 2014-10-22 13:47:41 +02:00
commit 4075a08aec
1 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dot_files/gitconfig
View file

@ -77,13 +77,8 @@ cmd = git mergetool --no-prompt
[guitool "mergetool"]
cmd = git mergetool --no-prompt
[merge]
tool = kdiff3
[mergetool "kdiff3"]
cmd = kdiff3
args = --L1 base --L2 mine --L3 theirs $base $local $other -o $output
keepBackup = false
# [merge]
# tool = kdiff3
[push]
default = current