Commit Diff

Commit:
f2877bf5fb7b1ec6daac63fbdf110ea1ff6308c6
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
expose merge commits in log output again
Actions:
Patch | Tree
commit - 2b380cc817b771c4c1b50a2030d92bf72be175a7
commit + f2877bf5fb7b1ec6daac63fbdf110ea1ff6308c6
blob - a34759f0bcd0e3d01e5ce08a9c3545a0a76a3591
blob + 24ce3257675c611532e5fdb59eea01cece7c8f25
--- lib/commit_graph.c
+++ lib/commit_graph.c
@@ -441,7 +441,7 @@ add_node(struct got_commit_graph_node **new_node,
 		return got_error_from_errno();
 	}
 
-	if (changed && !is_merge_point(node))
+	if (changed)
 		add_node_to_iter_list(graph, node, child_node);
 
 	if (branch_done)