Advertisement
Guest User

Untitled

a guest
Apr 24th, 2017
129
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.44 KB | None | 0 0
  1. [diff]
  2. tool = semanticmerge
  3. [difftool "semanticmerge"]
  4. cmd = \"C:\\Users\\User\\AppData\\Local\\semanticmerge\\semanticmergetool.exe\" -s \"$LOCAL\" -d \"$REMOTE\"
  5. [difftool]
  6. prompt = false
  7. [merge]
  8. tool = semanticmerge
  9. [mergetool "semanticmerge"]
  10. cmd = \"C:\\Users\\User\\AppData\\Local\\semanticmerge\\semanticmergetool.exe\" -s \"$LOCAL\" -d \"$REMOTE\" -b \"$BASE\" -r \"$MERGED\"
  11. prompt = false
  12. keepBackup = false
  13. trustExitCode = true
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement