Last active
October 29, 2020 05:18
-
-
Save YanhaoYang/4471979 to your computer and use it in GitHub Desktop.
Using DiffMerge as your Git visual merge and diff tool on Mac
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[diff] | |
tool = diffmerge | |
[difftool "diffmerge"] | |
cmd = diffmerge \"$LOCAL\" \"$REMOTE\" | |
[merge] | |
tool = diffmerge | |
[mergetool "diffmerge"] | |
cmd = "diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE\"; then echo \"$BASE\"; else echo \"$LOCAL\"; fi)\" \"$REMOTE\"" | |
trustExitCode = true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
git config --global diff.tool diffmerge | |
git config --global difftool.diffmerge.cmd 'diffmerge "$LOCAL" "$REMOTE"' | |
git config --global merge.tool diffmerge | |
git config --global mergetool.diffmerge.cmd 'diffmerge --merge --result="$MERGED" "$LOCAL" "$(if test -f "$BASE"; then echo "$BASE"; else echo "$LOCAL"; fi)" "$REMOTE"' | |
git config --global mergetool.diffmerge.trustExitCode true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/sh | |
## A little script to make it easier to launch DiffMerge from the command line. | |
## Install this script into a folder in your path, such as /usr/bin or /usr/local/bin. | |
## | |
## Version 3.3.0.1001 | |
## Copyright (C) 2003-2009 SourceGear LLC. All Rights Reserved. | |
############################################################################## | |
## Change DIFFMERGE_PATH to point to where you installed DiffMerge | |
DIFFMERGE_PATH=/Volumes/App/Applications/DiffMerge.app | |
## The actual executable is hidden inside the .app bundle. | |
DIFFMERGE_EXE=${DIFFMERGE_PATH}/Contents/MacOS/DiffMerge | |
## Launch DiffMerge using the given command line arguments. Use --help for | |
## additional information or see the man page distributed along with this | |
## shell script. | |
exec ${DIFFMERGE_EXE} --nosplash "$@" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Do I need to download these files and keep somewhere in my MAC?