diff options
| author | nyamatongwe <unknown> | 2001-01-17 23:34:45 +0000 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2001-01-17 23:34:45 +0000 |
| commit | 55ebbc8553e3abe46dcfad610630905fbbd9df90 (patch) | |
| tree | 7d33530b8d5e8a25ccd45392b4886417634bf2c8 | |
| parent | 9434647675ef0e65148b119cad80c0acf24c7b68 (diff) | |
| download | scintilla-mirror-55ebbc8553e3abe46dcfad610630905fbbd9df90.tar.gz | |
Added link to WinMerge.
| -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 |