diff options
Diffstat (limited to 'doc/ScintillaRelated.html')
| -rw-r--r-- | doc/ScintillaRelated.html | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/ScintillaRelated.html b/doc/ScintillaRelated.html index 36baf2ef1..68890b766 100644 --- a/doc/ScintillaRelated.html +++ b/doc/ScintillaRelated.html @@ -145,6 +145,11 @@ Java code. SciTE has an Indent command defined for .cxx files that uses AStyle. </p> <p> + <a href="http://winmerge.sourceforge.net/">WinMerge</a> is an interactive diff / merge + for Windows. I prefer code submissions in the form of source files rather than diffs and then run + WinMerge over the files to work out how to merge. + </p> + <p> <a href="http://www.python.org">Python</a> is my favourite programming language. Scintilla was started after I tried to improve the editor built into <a href="http://www.python.org/windows/">PythonWin</a>, but was frustrated by the limitations of |