Skip to content

Instantly share code, notes, and snippets.

@evandroamparo

evandroamparo/WinMergeSourcetree.txt

Last active June 6, 2023 14:27
Show Gist options
  • Save evandroamparo/a36872b29059e205d045 to your computer and use it in GitHub Desktop.
Save evandroamparo/a36872b29059e205d045 to your computer and use it in GitHub Desktop.
Download ZIP
WinMerge with Sourcetree
Raw
WinMergeSourcetree.txt
Diff tool: C:\Program Files (x86)\WinMerge\WinMergeU.exe
Arguments: "$LOCAL" "$REMOTE" -dl "Local" -dr "Remote"
Merge tool: C:\Program Files (x86)\WinMerge\WinMergeU.exe
Arguments: "$MERGED"
@k9t9
Copy link

k9t9 commented Mar 25, 2019

is that working with 2.16 as a real 3-way diff tool as git requires ?

@pytlus93
Copy link

pytlus93 commented Apr 21, 2022 •
edited

I found this for Merging:
-wl -wr -dl Remote -dm Base -dr Local \"$REMOTE\" \"$BASE\" \"$LOCAL\" -o \"$MERGED\"

@evandroamparo
Copy link
Author

Cool!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment