From: Todd C. Miller <Todd.Miller@sudo.ws>
Date: Mon, 11 Dec 2017 02:45:52 +0000 (-0700)
Subject: Don't print mercurial branch info for merges.
X-Git-Tag: SUDO_1_8_22^2~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d13fe4fae81bbf33ac2e5f19a72e099ce55bb76;p=sudo

Don't print mercurial branch info for merges.
---

diff --git a/log2cl.pl b/log2cl.pl
index af3eddc64..9cfd96886 100755
--- a/log2cl.pl
+++ b/log2cl.pl
@@ -62,6 +62,7 @@ while (<LOG>) {
 
 	# Commit message body (multi-line)
 	foreach (@lines) {
+	    last if $_ eq "--HG--";
 	    if (defined($body)) {
 		$_ = "\r" if $_ eq "";
 		$body .= " $_";