Advertisement
Guest User

Untitled

a guest
Mar 24th, 2017
57
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.38 KB | None | 0 0
  1. #!/bin/sh
  2. echo Launching WinMergeU.exe: $1 $2
  3. "C:/Program Files (x86)/WinMerge/WinMergeU.exe"
  4. git /e /u /dl "Base" /dr "Mine" "$1" "$2"
  5.  
  6. git config --global diff.tool winmerge
  7. git config --global difftool.winmerge.cmd "winmerge.sh "$LOCAL" "$REMOTE""
  8. git config --global difftool.prompt false
  9.  
  10. git config option merge.tool set to unknown tool: winmerge
  11.  
  12. git config --global merge.tool winmerge
  13. git config --replace --global mergetool.winmerge.cmd ""C:Program Files (x86)WinMergeWinMergeU.exe" -e -u -dl "Base" -dr "Mine" "$LOCAL" "$REMOTE" "$MERGED""
  14. git config --global mergetool.prompt false
  15.  
  16. git mergetool
  17.  
  18. C:Program Files (x86)WinMergeWinMergeU.exe
  19.  
  20. -e -u -dl "Mine" -wr -dr "Theirs" $LOCAL $REMOTE $MERGED
  21.  
  22. git config --global mergetool.keepBackup false
  23.  
  24. git config --global --edit
  25.  
  26. [diff]
  27. tool = winmerge
  28. [difftool "winmerge"]
  29. cmd = c:/path/to/winmergeu.exe -e -u -x -wl -wr -dl "base" -dr "mine" "$LOCAL" "$REMOTE"
  30.  
  31. git config --global diff.tool winmerge
  32.  
  33. git config --replace --global difftool.winmerge.cmd ""C:path to winmergeWinMergeU.exe" -e -u -dl "Base" -dr "Mine" $LOCAL $REMOTE"
  34.  
  35. git config --global difftool.prompt false
  36.  
  37. git config --global --add diff.tool winmerge
  38. git config --replace --global difftool.winmerge.cmd ""C:Program Files (x86)WinMergeWinMergeU.exe" -e -u -dl "Base" -dr "Mine" $LOCAL $REMOTE"
  39. git config --global difftool.prompt false
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement