Skip to content

Instantly share code, notes, and snippets.

@Haruki
Last active May 11, 2018 12:55
Show Gist options
  • Save Haruki/af362c2033a3e54077e025bebdf41bf7 to your computer and use it in GitHub Desktop.
Save Haruki/af362c2033a3e54077e025bebdf41bf7 to your computer and use it in GitHub Desktop.
[core]
autocrlf = true
[user]
email = borsutzky@hansaluftbild.de
name = Harald Borsutzky
[push]
default = simple
[apply]
whitespace = nowarn
[diff]
tool = kdiff3
[merge]
tool = kdiff3
[difftool "kdiff3"]
cmd = kdiff3.exe \"`echo $LOCAL | sed 's_/mnt/c_C:_'`\" \"`echo $REMOTE | sed 's_/mnt/c_C:_'`\"
[mergetool "kdiff3"]
cmd = kdiff3.exe \"`echo $BASE | sed 's_/mnt/c_C:_'`\" \"`echo $LOCAL | sed 's_/mnt/c_C:_'`\" \"`echo $REMOTE | sed 's_/mnt/c_C:_'`\" -o \"`echo $MERGED | sed 's_/mnt/c_C:_'`\"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment