git merge tool: meld
This commit is contained in:
parent
3bedf87cf1
commit
0cb0f6e798
1 changed files with 6 additions and 0 deletions
|
@ -34,3 +34,9 @@
|
|||
helper = store
|
||||
[credential "https://github.com"]
|
||||
helper = cache
|
||||
[mergetool "meld"]
|
||||
cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
|
||||
[merge]
|
||||
tool = meld
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue