Differences From Artifact [deba3fa65f]:
- File src/merge3.c — part of check-in [43631b087b] at 2012-03-18 23:44:08 on branch trunk — Fix compiler warnings and update custom makefile. (user: mistachkin size: 14661) [more...]
To Artifact [073d2c2ae8]:
- File src/merge3.c — part of check-in [a496d8e88d] at 2012-03-29 14:54:45 on branch mgagnon_fix — Add vim modline everywhere (user: mgagnon size: 14703)
| ︙ | ︙ | |||
443 444 445 446 447 448 449 |
fossil_free(zPivot);
fossil_free(zOrig);
fossil_free(zOther);
}
blob_reset(&v1);
return rc;
}
| > > > > > | 443 444 445 446 447 448 449 450 451 452 453 454 |
fossil_free(zPivot);
fossil_free(zOrig);
fossil_free(zOther);
}
blob_reset(&v1);
return rc;
}
/*
* vim:ts=2:sts=2:et:sw=2:ft=c
*/
|