Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- #!/bin/sh
- echo Launching WinMergeU.exe: $1 $2
- "C:/Program Files (x86)/WinMerge/WinMergeU.exe"
- git /e /u /dl "Base" /dr "Mine" "$1" "$2"
- git config --global diff.tool winmerge
- git config --global difftool.winmerge.cmd "winmerge.sh "$LOCAL" "$REMOTE""
- git config --global difftool.prompt false
- git config option merge.tool set to unknown tool: winmerge
- git config --global merge.tool winmerge
- git config --replace --global mergetool.winmerge.cmd ""C:Program Files (x86)WinMergeWinMergeU.exe" -e -u -dl "Base" -dr "Mine" "$LOCAL" "$REMOTE" "$MERGED""
- git config --global mergetool.prompt false
- git mergetool
- C:Program Files (x86)WinMergeWinMergeU.exe
- -e -u -dl "Mine" -wr -dr "Theirs" $LOCAL $REMOTE $MERGED
- git config --global mergetool.keepBackup false
- git config --global --edit
- [diff]
- tool = winmerge
- [difftool "winmerge"]
- cmd = c:/path/to/winmergeu.exe -e -u -x -wl -wr -dl "base" -dr "mine" "$LOCAL" "$REMOTE"
- git config --global diff.tool winmerge
- git config --replace --global difftool.winmerge.cmd ""C:path to winmergeWinMergeU.exe" -e -u -dl "Base" -dr "Mine" $LOCAL $REMOTE"
- git config --global difftool.prompt false
- git config --global --add diff.tool winmerge
- git config --replace --global difftool.winmerge.cmd ""C:Program Files (x86)WinMergeWinMergeU.exe" -e -u -dl "Base" -dr "Mine" $LOCAL $REMOTE"
- git config --global difftool.prompt false
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement