Skip to content

Instantly share code, notes, and snippets.

@samuraitruong

samuraitruong/k3diff config

Created March 31, 2018 03:25
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save samuraitruong/9a09eb6f83bb2caa4c9fc28e1f0e0338 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save samuraitruong/9a09eb6f83bb2caa4c9fc28e1f0e0338 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
k3diff config
git config --global --add merge.tool kdiff3
git config --global --add mergetool.kdiff3.path "C:/Program Files/KDiff3/kdiff3.exe"
git config --global --add mergetool.kdiff3.trustExitCode false
git config --global --add diff.guitool kdiff3
git config --global --add difftool.kdiff3.path "C:/Program Files/KDiff3/kdiff3.exe"
git config --global --add difftool.kdiff3.trustExitCode false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment