From ce5d38d01e9daa52cdd695bf0e472cb5a578374c Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Sun, 20 Oct 2019 10:29:14 +0000 Subject: [PATCH] fixup: one more Merge() where newest should be on the right --- render/render.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/render/render.go b/render/render.go index 74c2b826f..2ab6f8d25 100644 --- a/render/render.go +++ b/render/render.go @@ -180,7 +180,7 @@ func (ret *joinResults) mapChild(from, to string) { // Note it is not safe to mix calls to add() with addChild(), addChildAndChildren() or addUnmappedChild() func (ret *joinResults) add(from string, m report.Node) { if existing, ok := ret.nodes[m.ID]; ok { - m = m.Merge(existing) + m = existing.Merge(m) } ret.nodes[m.ID] = m ret.mapChild(from, m.ID)