1
目前我有这个gitconfig:如何配置提示diffmerge
[diff]
tool = diffmerge
[difftool "diffmerge"]
cmd = diffmerge \"$LOCAL\" \"$REMOTE\"
[merge]
tool = diffmerge
[mergetool "diffmerge"]
cmd = "diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE\"; then echo \"$BASE\"; else echo \"$LOCAL\"; fi)\" \"$REMOTE\""
trustExitCode = true
[alias]
df = difftool
每次我开始difftool通过git的difftool somefile..somefile,我得到提示:
Hit return to launch 'diffmerge':
哪有我设置这个提示是这样的,如果我输入“Y”它会打开文件,如果“N”跳过它?