Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- [user]
- name = Abdullah
- email = [email protected]
- [merge]
- tool = meld
- [mergetool "meld"]
- cmd = meld --auto-merge \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output \"$MERGED\" --label \"MERGE (REMOTE BASE MY)\"
- trustExitCode = false
- [mergetool]
- prompt = false
- keepBackup = false
- [diff]
- guitool = meld
- tool = meld
- [difftool "meld"]
- cmd = \"C:/Program Files (x86)/Meld/Meld.exe\" \"$LOCAL\" \"$REMOTE\"
- path = C:/Program Files (x86)/Meld/Meld.exe
- [difftool]
- prompt = false
- [merge]
- tool = meld
- [mergetool "meld"]
- path = C:/Program Files (x86)/Meld/Meld.exe
- cmd = \"C:/Program Files (x86)/Meld/Meld.exe\" --diff \"$BASE\" \"$LOCAL\" \"$REMOTE\" --output \"$MERGED\"
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement