test

[merge]
        tool = kdiff3
[diff]
        guitool = kdiff3
[core]
        editor = notepad
        autocrlf = true
[user]
        name = xxxx
        email = [email protected]
[alias]
        co = checkout
        cp = cherry-pick
        ci = commit
        st = status
        br = branch
        df = diff
        dfw = diff -w --ignore-blank-lines
        dfc = diff --cached
        hist = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
        type = cat-file -t
        dump = cat-file -p
[mergetool "kdiff3"]
        path = C:/Program Files (x86)/KDiff3/kdiff3.exe
[difftool "kdiff3"]
        path = C:/Program Files (x86)/KDiff3/kdiff3.exe
[http]
        sslverify = false
[pull]
        rebase = true