Skip to content

Commit 3723ef6

Browse files
remove meld
1 parent 90af400 commit 3723ef6

1 file changed

Lines changed: 0 additions & 14 deletions

File tree

git/gitconfig.symlink

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,6 @@
2828
editor = gvim -f
2929
[color]
3030
diff = auto
31-
[diff]
32-
tool = meld
33-
[difftool]
34-
prompt = false
35-
[difftool "meld"]
36-
trustExitCode = true
37-
cmd = open -W -a Meld --args \"$LOCAL\" \"$REMOTE\"
38-
[merge]
39-
tool = meld
40-
[mergetool]
41-
prompt = false
42-
[mergetool "meld"]
43-
trustExitCode = true
44-
cmd = open -W -a Meld --args --auto-merge \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output=\"$MERGED\"
4531
[push]
4632
default = current
4733
[pager]

0 commit comments

Comments
 (0)