index b3725750bbfbdef80f73420e29eb666dab3fe9b9..93a73657e249734dc7cd0fea779c12fc102f0557 100644 (file)
--- a/notes.h
+++ b/notes.h
int combine_notes_concatenate(unsigned char *cur_sha1, const unsigned char *new_sha1);
int combine_notes_overwrite(unsigned char *cur_sha1, const unsigned char *new_sha1);
int combine_notes_ignore(unsigned char *cur_sha1, const unsigned char *new_sha1);
+int combine_notes_cat_sort_uniq(unsigned char *cur_sha1, const unsigned char *new_sha1);
/*
* Notes tree object