Compare commits

..

No commits in common. "dc6af1cb63915bb2041fce532b831ae55945e69f" and "626f274d4690d6458fe2001d443b8ee31def52f8" have entirely different histories.

View file

@ -16,9 +16,4 @@
required = true
[pull]
ff = only
[diff]
tool = meld
[difftool]
prompt = false
[difftool "meld"]
cmd = meld "$LOCAL" "$REMOTE"