Skip to content

Instantly share code, notes, and snippets.

@xwipeoutx

xwipeoutx/git-extensions-diff-config.md

Last active February 2, 2017 06:52
Show Gist options
  • Save xwipeoutx/03088d641c5d2000a3e73c3d18b5f7a9 to your computer and use it in GitHub Desktop.
Save xwipeoutx/03088d641c5d2000a3e73c3d18b5f7a9 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
git-extensions-diff-config.md

Git Extensions

Path to mergetool:

C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe

Mergetool command:

"C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe" /m /r="$MERGED" "$LOCAL" "$BASE" "$REMOTE"

Path to difftool:

C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe

Difftool command:

"C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe" "$LOCAL" "$REMOTE"

.gitconfig

[credential]
	helper = manager
[merge]
	tool = DiffMerge
[diff]
	guitool = kdiff3
[core]
	editor = \"C:/Program Files (x86)/GitExtensions/GitExtensions.exe\" fileeditor
	autocrlf = true
[mergetool "DiffMerge"]
	path = C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe
	cmd = \"C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe\" /m /r=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
[difftool "kdiff3"]
	path = C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe
	cmd = \"C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe\" \"$LOCAL\" \"$REMOTE\"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment