Advertisement
Guest User

Untitled

a guest
Nov 12th, 2019
131
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Bash 0.44 KB | None | 0 0
  1. ########## Kaleidoscope ##########
  2.  
  3. [diff]
  4.     tool = Kaleidoscope
  5. [difftool]
  6.     prompt = false
  7. [difftool "Kaleidoscope"]
  8.     cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
  9. [merge]
  10.     tool = Kaleidoscope
  11. [mergetool]
  12.     prompt = false
  13. [mergetool "Kaleidoscope"]
  14.     cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
  15.     trustexitcode = true
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement