Commit f2877bf5fb7b1ec6daac63fbdf110ea1ff6308c6

Stefan Sperling 2018-10-24T15:49:13

expose merge commits in log output again

1
2
3
4
5
6
7
8
9
10
11
12
13
diff --git a/lib/commit_graph.c b/lib/commit_graph.c
index a34759f..24ce325 100644
--- a/lib/commit_graph.c
+++ b/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)