Advertisement
Guest User

.config

a guest
Jan 27th, 2019
213
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.71 KB | None | 0 0
  1. [user]
  2. name = Abdullah
  3. [merge]
  4. tool = meld
  5. [mergetool "meld"]
  6. cmd = meld --auto-merge \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output \"$MERGED\" --label \"MERGE (REMOTE BASE MY)\"
  7. trustExitCode = false
  8. [mergetool]
  9. prompt = false
  10. keepBackup = false
  11. [diff]
  12. guitool = meld
  13. tool = meld
  14. [difftool "meld"]
  15. cmd = \"C:/Program Files (x86)/Meld/Meld.exe\" \"$LOCAL\" \"$REMOTE\"
  16. path = C:/Program Files (x86)/Meld/Meld.exe
  17. [difftool]
  18. prompt = false
  19. [merge]
  20. tool = meld
  21. [mergetool "meld"]
  22. path = C:/Program Files (x86)/Meld/Meld.exe
  23. cmd = \"C:/Program Files (x86)/Meld/Meld.exe\" --diff \"$BASE\" \"$LOCAL\" \"$REMOTE\" --output \"$MERGED\"
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement