| commit | fb737aa0ef2c78e8b66acb26880723314d072e64 | [log] [tgz] |
|---|---|---|
| author | Michal Vasko <mvasko@cesnet.cz> | Thu Aug 06 13:53:53 2020 +0200 |
| committer | Michal Vasko <mvasko@cesnet.cz> | Thu Aug 06 13:53:53 2020 +0200 |
| tree | 1912bca3ec92b91b6886384e89397ca6c371d930 | |
| parent | 8b06a5e258efad58e48ff5e1724e1764cda627ef [diff] [blame] |
data tree CHANGE switch diff merge parameters SO that it follows general merge prototype.
diff --git a/src/validation.c b/src/validation.c index 6760c13..2d71846 100644 --- a/src/validation.c +++ b/src/validation.c
@@ -98,7 +98,7 @@ LY_CHECK_RET(lyd_diff_add(node, op, NULL, NULL, NULL, NULL, NULL, &new_diff)); /* merge into existing diff */ - ret = lyd_diff_merge_all(new_diff, diff); + ret = lyd_diff_merge_all(diff, new_diff); lyd_free_tree(new_diff); return ret;