X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgit-merge-changelog.c;h=999407a0c224d73b04b9e843f102abdbd06cdc21;hb=f4c549fab688ce822556eadcf60fdda5042ade11;hp=2affd9f1dc142989a8551b4f6bf86e2ba88787a4;hpb=441aa3044f43e5572f58c354f01e6bc070acd5c7;p=gnulib.git

diff --git a/lib/git-merge-changelog.c b/lib/git-merge-changelog.c
index 2affd9f1d..999407a0c 100644
--- a/lib/git-merge-changelog.c
+++ b/lib/git-merge-changelog.c
@@ -1,5 +1,5 @@
 /* git-merge-changelog - git "merge" driver for GNU style ChangeLog files.
-   Copyright (C) 2008-2009 Bruno Haible <bruno@clisp.org>
+   Copyright (C) 2008-2010 Bruno Haible <bruno@clisp.org>
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -130,7 +130,7 @@
 #include "progname.h"
 #include "error.h"
 #include "read-file.h"
-#include "gl_list.h"
+#include "gl_xlist.h"
 #include "gl_array_list.h"
 #include "gl_linkedhash_list.h"
 #include "gl_rbtreehash_list.h"
@@ -947,6 +947,7 @@ usage (int status)
       printf ("B-FILE-NAME names the user-modified file.\n");
       printf ("Writes the merged file into A-FILE-NAME.\n");
       printf ("\n");
+      #if 0 /* --split-merged-entry is now on by default.  */
       printf ("Operation modifiers:\n");
       printf ("\
       --split-merged-entry    Possibly split a merged entry between paragraphs.\n\
@@ -955,6 +956,7 @@ usage (int status)
                               newline, just because they happened on the same\n\
                               date.\n");
       printf ("\n");
+      #endif
       printf ("Informative output:\n");
       printf ("  -h, --help                  display this help and exit\n");
       printf ("  -V, --version               output version information and exit\n");
@@ -980,7 +982,7 @@ main (int argc, char *argv[])
   /* Set default values for variables.  */
   do_help = false;
   do_version = false;
-  split_merged_entry = false;
+  split_merged_entry = true;
 
   /* Parse command line options.  */
   while ((optchar = getopt_long (argc, argv, "hV", long_options, NULL)) != EOF)
@@ -995,7 +997,6 @@ main (int argc, char *argv[])
       do_version = true;
       break;
     case CHAR_MAX + 1:  /* --split-merged-entry */
-      split_merged_entry = true;
       break;
     default:
       usage (EXIT_FAILURE);