kdiff3使用

Posted on Views: Views:

.gitconfig

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
[user]
	email = fangyh09@gmail.com
	name = fangyh09
[oh-my-zsh]
	hide-status = 1
[core]
	autocrlf = input

[merge]
	tool = kdiff3
[mergetool "kdiff3"]
    cmd = /Applications/kdiff3.app/Contents/MacOS/kdiff3 \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\"
    trustExitCode = false
    path = /Applications/kdiff3.app/Contents/MacOS/kdiff3
[mergetool]
    keepBackup = false

[diff]
    tool = kdiff3
[difftool "kdiff3"]
    cmd = /Applications/kdiff3.app/Contents/MacOS/kdiff3 $LOCAL $REMOTE%
1
git mergetool README.md