Differences From Artifact [f72871c5bf]:

• File src/merge3.c — part of check-in [2c42b217e5] at 2016-10-20 16:48:05 on branch trunk — Remove extra newlines from calls to fossil_fatal() (user: andygoth size: 16753) [more...]

To Artifact [be0896e3e4]:

• File src/merge3.c — part of check-in [e5b62edb28] at 2016-11-04 22:37:21 on branch trunk — Consistently use the count(X) macro in place of sizeof(X)/sizeof(*X) throughout the Fossil core, excluding things that don't use makeheaders. Also use count(X) instead of ArraySize(X) which has the same definition. (user: andygoth size: 16729) [more...]

314
315
316
317
318
319
320
321

322
323
324
325
326
327
328

314
315
316
317
318
319
320

321
322
323
324
325
326
327
328

-
+

  int i, j;
  int len = (int)strlen(mergeMarker[0]);
  const char *z = blob_buffer(p);
  int n = blob_size(p) - len + 1;
  assert( len==(int)strlen(mergeMarker[1]) );
  assert( len==(int)strlen(mergeMarker[2]) );
  assert( len==(int)strlen(mergeMarker[3]) );
  assert( sizeof(mergeMarker)/sizeof(mergeMarker[0])==4 );
  assert( count(mergeMarker)==4 );
  for(i=0; i<n; ){
    for(j=0; j<4; j++){
      if( memcmp(&z[i], mergeMarker[j], len)==0 ) return 1;
    }
    while( i<n && z[i]!='\n' ){ i++; }
    while( i<n && z[i]=='\n' ){ i++; }
  }