From 55ebbc8553e3abe46dcfad610630905fbbd9df90 Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Wed, 17 Jan 2001 23:34:45 +0000
Subject: Added link to WinMerge.

---
 doc/ScintillaRelated.html | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'doc')

diff --git a/doc/ScintillaRelated.html b/doc/ScintillaRelated.html
index 36baf2ef1..68890b766 100644
--- a/doc/ScintillaRelated.html
+++ b/doc/ScintillaRelated.html
@@ -144,6 +144,11 @@
        <a href="http://astyle.sourceforge.net/">AStyle</a> is a source code formatter for C++ and
       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
-- 
cgit v1.2.3