1,could not start external diff program的问题
今天装完SVN之后,用来查看文件不同老是出现could not start external diff program,网上找了很多资料也没找到自己想要的,无意中中右键 Settings看到有个Diff Viewer 点进去发现默认选择 External,于是我改成TortoiseMerge就可以了。
最后再说下修改方法:
Settings >> Diff Viewer >> TortoiseMerge
2,git pull下拉代码报错Bad file number
找到git->settings->Git->第一个 Edit local .git/config
->修改
[branch “master”]
remote = origin
merge = refs/heads/master
为
[branch “master”]
remote = origin master
merge = refs/heads/master
http://blog.sina.com.cn/s/blog_6b9a97ff0102vikl.html