Compare commits
2 commits
626f274d46
...
dc6af1cb63
Author | SHA1 | Date | |
---|---|---|---|
Geoffrey Frogeye | dc6af1cb63 | ||
Geoffrey Frogeye | 6046cb2df7 |
|
@ -16,4 +16,9 @@
|
||||||
required = true
|
required = true
|
||||||
[pull]
|
[pull]
|
||||||
ff = only
|
ff = only
|
||||||
|
[diff]
|
||||||
|
tool = meld
|
||||||
|
[difftool]
|
||||||
|
prompt = false
|
||||||
|
[difftool "meld"]
|
||||||
|
cmd = meld "$LOCAL" "$REMOTE"
|
||||||
|
|
Loading…
Reference in a new issue