X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=graph.c;h=e2633f8376eb7b12706dcd4c698e2b3f6be2b433;hb=d36f8679e94c2a0d4d15d6adcea434634af6d627;hp=283b13792d943e19ba2b68cf9705ada03dbadc94;hpb=a0ebe573a516a1530a2c072e513fa7f529781dd0;p=git.git

diff --git a/graph.c b/graph.c
index 283b13792..e2633f837 100644
--- a/graph.c
+++ b/graph.c
@@ -679,20 +679,6 @@ static void graph_output_commit_char(struct git_graph *graph, struct strbuf *sb)
 		return;
 	}
 
-	/*
-	 * Print 'M' for merge commits
-	 *
-	 * Note that we don't check graph->num_parents to determine if the
-	 * commit is a merge, since that only tracks the number of
-	 * "interesting" parents.  We want to print 'M' for merge commits
-	 * even if they have less than 2 interesting parents.
-	 */
-	if (graph->commit->parents != NULL &&
-	    graph->commit->parents->next != NULL) {
-		strbuf_addch(sb, 'M');
-		return;
-	}
-
 	/*
 	 * Print '*' in all other cases
 	 */