Provide 'git merge --abort' as a synonym to 'git reset --merge'

[git.git] / notes.h

diff --git a/notes.h b/notes.h
index b3725750bbfbdef80f73420e29eb666dab3fe9b9..93a73657e249734dc7cd0fea779c12fc102f0557 100644 (file)
--- a/notes.h
+++ b/notes.h
@@ -27,6 +27,7 @@ typedef int (*combine_notes_fn)(unsigned char *cur_sha1, const unsigned char *ne
 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