File	Date	Author	Commit
MergeTool	2012-08-30	Ruffin Bailey	[430380] Changed SHARED status; Added testing GUI.
libUnconflict	2012-08-30	Ruffin Bailey	[430380] Changed SHARED status; Added testing GUI.
.gitignore	2012-08-30	Ruffin Bailey	[430380] Changed SHARED status; Added testing GUI.
LICENSE.TXT	2012-07-16	Ruffin Bailey	[54480d] First potentially functioning two file diff eng...
MergeToolEngine.sln	2012-07-16	Ruffin Bailey	[54480d] First potentially functioning two file diff eng...
MergeToolEngine.userprefs	2012-08-30	Ruffin Bailey	[430380] Changed SHARED status; Added testing GUI.
README.TXT	2012-07-16	Ruffin Bailey	[54480d] First potentially functioning two file diff eng...

Read Me

THIS IS UNSUPPORTED SOFTWARE; USE AT YOUR OWN RISK.

Note that there are better ways to do this:
http://code.google.com/p/google-diff-match-patch/

This code is written for readability, not necessarily rock-solid
efficiency.  Emphasis is going to be given to getting a good conflict
file reader going first, but afterwards the codebase should lend itself
to a decent visual diff client in general.  I don't see one written in
C# so far, so here you go.

Note also that this code is being written on MonoDevelop using Mono
(http://www.mono-project.com/Main_Page), and that files will
occasionally be checked in with Mono-specific files/overhead.  If things
don't build properly, start checking there.

LICENSE.TXT holds the licensing information for this project.  This
project is protected by the LGPL.

That's enough of a README for a pre-alpha project with a poorly written
diff engine.  Enjoy.

rufwork@gmail.com

THIS IS UNSUPPORTED SOFTWARE; USE AT YOUR OWN RISK.