SHA1 Hash:	ba9af9acedf935cb086faa22dcfac54d4dd5ba88
Date:	2007-11-29 00:37:41
User:	drh
Comment:	Fix the merge conflict detection.
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-trunk inherited from [a28c83647d]

Modified src/merge3.c from [b966dfba2b] to [e01dd37d11].

@@ -49,12 +49,12 @@
 */
 static int sameLine(Blob *pV1, Blob *pV2){
   char *z1, *z2;
   int i;
 
-  z1 = blob_buffer(pV1);
-  z2 = blob_buffer(pV2);
+  z1 = &blob_buffer(pV1)[blob_tell(pV1)];
+  z2 = &blob_buffer(pV2)[blob_tell(pV2)];
   for(i=0; z1[i]!='\n' && z1[i]==z2[i]; i++){}
   return z2[i]=='\n' || (z2[i]=='\r' && z2[i+1]=='\n')
           || (z1[i]=='\r' && z2[i]=='\n' && z1[i+1]=='\n');
 }