Skip to content
Permalink
Branch: master
Find file Copy path
Find file Copy path
Fetching contributors…
Cannot retrieve contributors at this time
9 lines (7 sloc) 128 Bytes
[merge]
log = true
conflictstyle = diff3
tool = meld
[mergetool]
keepbackup = true
keeptemporaries = false
You can’t perform that action at this time.