14,970
edits
Text diff tools: Difference between revisions
Jump to navigation
Jump to search
no edit summary
mNo edit summary |
No edit summary |
||
| Line 93: | Line 93: | ||
Other shareware: [http://www.araxis.com/merge/index.html Araxis Merge], [http://www.fileware.com/products.htm#FileDiff FileDiff], [http://www.prestosoft.com/edp_examdiffpro.asp ExamDiff Pro] | Other shareware: [http://www.araxis.com/merge/index.html Araxis Merge], [http://www.fileware.com/products.htm#FileDiff FileDiff], [http://www.prestosoft.com/edp_examdiffpro.asp ExamDiff Pro] | ||
== Dropbox + diff tools == | |||
* [https://chrome.google.com/webstore/detail/aefdkgcdokdiaoppobphjogcilaaakka Chrome Web Store - DropboxDiff] {{chrome}} | |||
Supported diff tools quoted from official | |||
<pre> | |||
"%ProgramFiles%\TortoiseSVN\bin\TortoiseMerge.exe" | |||
"%ProgramFiles%\KDiff3\kdiff3.exe" | |||
bash -c '"$HOME/bin/tkdiff" $1 $2' | |||
</pre> | |||
more on | more on | ||