aboutsummaryrefslogtreecommitdiffstats
path: root/src/tag.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/tag.h')
-rw-r--r--src/tag.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/tag.h b/src/tag.h
index 549a696de..6931453f7 100644
--- a/src/tag.h
+++ b/src/tag.h
@@ -184,6 +184,15 @@ struct tag *
tag_merge(const struct tag *base, const struct tag *add);
/**
+ * Merges the data from two tags. Any of the two may be NULL. Both
+ * are freed by this function.
+ *
+ * @return a newly allocated tag, which must be freed with tag_free()
+ */
+struct tag *
+tag_merge_replace(struct tag *base, struct tag *add);
+
+/**
* Returns true if the tag contains no items. This ignores the "time"
* attribute.
*/