projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
New module 'unicase/ulc-casecoll'.
[pspp]
/
lib
/
git-merge-changelog.c
diff --git
a/lib/git-merge-changelog.c
b/lib/git-merge-changelog.c
index c3ebf7f5ee0088a4d1013509d881ea3f4fef0c4b..524d5d34939242a658fbd989ce57cb05de2fdb03 100644
(file)
--- a/
lib/git-merge-changelog.c
+++ b/
lib/git-merge-changelog.c
@@
-808,7
+808,7
@@
conflict_write (FILE *fp, struct conflict *c)
/* Long options. */
static const struct option long_options[] =
-{
+{
{ "help", no_argument, NULL, 'h' },
{ "split-merged-entry", no_argument, NULL, CHAR_MAX + 1 },
{ "version", no_argument, NULL, 'V' },