X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=uci.h;h=6b5de9a598f3bd19237912fcd46d85f61d7e927f;hp=93f8bce9730726c14a2627cc004724e4b4dd939a;hb=9387bced4effec755ccd2a5cdb52c00d0c45990b;hpb=b69b459ecce221f92235d0def138ff4af3c22543

diff --git a/uci.h b/uci.h
index 93f8bce..6b5de9a 100644
--- a/uci.h
+++ b/uci.h
@@ -105,6 +105,7 @@ extern void uci_perror(struct uci_context *ctx, const char *str);
  * @single: ignore the 'package' keyword and parse everything into a single package
  *
  * the name parameter is for config files that don't explicitly use the 'package <...>' keyword
+ * if 'package' points to a non-null struct pointer, enable history tracking and merge 
  */
 extern int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_package **package, bool single);
 
@@ -276,6 +277,7 @@ struct uci_parse_context
 	/* private: */
 	struct uci_package *package;
 	struct uci_section *section;
+	bool merge;
 	FILE *file;
 	const char *name;
 	char *buf;