tortoise git 加 beyond compare

来自bc官网的方法

Diff

1. Launch TortoiseGit | Settings
2. Switch to the Diff Viewer section under External Programs
3. Change the radio buttons from TortoiseMerge to External.
4. In the path edits, enter:
   "C:\Program Files (x86)\Beyond Compare 4\BComp.exe" %base %mine /title1=%bname /title2=%yname /leftreadonly

3-way Merge

1. Launch TortoiseGit | Settings
2. Switch to the Merge Tool section under External Programs
3. Change the radio buttons from TortoiseMerge to External.
4. In the path edits, enter:
   "C:\Program Files (x86)\Beyond Compare 4\BComp.exe" %mine %theirs %base %merged /title1=%yname /title2=%tname /title3=%bname /title4=%mname

参考

http://www.scootersoftware.com/support.php?zz=kb_vcs#tortoisegit

如何调试jsp

http://www.tutorialspoint.com/jsp/jsp_debugging.htm