# HG changeset patch
# User Jim Meyering <meyering@redhat.com>
# Date 1326872729 -3600
# Node ID 6763bb0fe8abb93e7c26ef2cf733fbc68e64a9aa
# Parent  772bd52aef0a86c1af0bc4ba5885e8ba9c9e6df7
gitlog-to-changelog: use "||", not "or" in expressions

* build-aux/gitlog-to-changelog (main): Use "||", not "or" in
expressions.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-18  Jim Meyering  <meyering@redhat.com>
+
+	gitlog-to-changelog: use "||", not "or" in expressions
+	* build-aux/gitlog-to-changelog (main): Use "||", not "or" in
+	expressions.
+
 2012-01-17  Joel E. Denny  <joeldenny@joeldenny.org>
 
 	gitlog-to-changelog: new option --no-cluster
diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
--- a/build-aux/gitlog-to-changelog
+++ b/build-aux/gitlog-to-changelog
@@ -3,7 +3,7 @@
     if 0;
 # Convert git log output to ChangeLog format.
 
-my $VERSION = '2012-01-17 21:54'; # UTC
+my $VERSION = '2012-01-18 07:44'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -313,10 +313,10 @@
       # or if this or the previous entry consists of two or more paragraphs,
       # then print the header.
       if ($no_cluster
-          or $date_line ne $prev_date_line
-          or "@coauthors" ne "@prev_coauthors"
-          or $multi_paragraph
-          or $prev_multi_paragraph)
+          || $date_line ne $prev_date_line
+          || "@coauthors" ne "@prev_coauthors"
+          || $multi_paragraph
+          || $prev_multi_paragraph)
         {
           $prev_date_line eq ''
             or print "\n";