diff --git a/notes-merge.c b/notes-merge.c
index 459b1c2bf2c4e8a849f9860430bc643a6152b9f5..71c4d45fcd1ac49630bdb8bc7b0aec658011c21b 100644 (file)
--- a/notes-merge.c
+++ b/notes-merge.c
die("failed to concatenate notes "
"(combine_notes_concatenate)");
return 0;
+ case NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ:
+ OUTPUT(o, 2, "Concatenating unique lines in local and remote "
+ "notes for %s", sha1_to_hex(p->obj));
+ if (add_note(t, p->obj, p->remote, combine_notes_cat_sort_uniq))
+ die("failed to concatenate notes "
+ "(combine_notes_cat_sort_uniq)");
+ return 0;
}
die("Unknown strategy (%i).", o->strategy);
}