Differences From:

File src/diff.c part of check-in [36b96b8616] - Rework the merge algorithm. It now only works for text files. But, it no longer gets confused by line endings (\r\n versus \n) and it reports conflicts. by drh on 2007-11-16 20:42:31. [view]

To:

File src/diff.c part of check-in [38b967dcf5] - Merge aku's CVS import changes into the main line. Fix a small bug in diff.c. by drh on 2007-11-17 00:29:42. [view]

@@ -24,9 +24,9 @@
 ** This file contains code used to compute a "diff" between two
 ** text files.
 */
 #include "config.h"
-#include "diff2.h"
+#include "diff.h"
 #include <assert.h>
 
 
 #if 0