We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 90af400 commit 3723ef6Copy full SHA for 3723ef6
1 file changed
git/gitconfig.symlink
@@ -28,20 +28,6 @@
28
editor = gvim -f
29
[color]
30
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
40
-[mergetool]
41
42
-[mergetool "meld"]
43
44
- cmd = open -W -a Meld --args --auto-merge \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output=\"$MERGED\"
45
[push]
46
default = current
47
[pager]
0 commit comments