Disable *all* backups when --no-backups used

[wiggle.git] / merge2.c

diff --git a/merge2.c b/merge2.c
index 98b04b697495b0dfc8f6f2af0217f599145b73c4..6c8fad7dbdbf8abff271855238bce27771d32b7c 100644 (file)
--- a/merge2.c
+++ b/merge2.c
@@ -3,6 +3,7 @@
  *
  * Copyright (C) 2005 Neil Brown <neilb@cse.unsw.edu.au>
  * Copyright (C) 2010-2013 Neil Brown <neilb@suse.de>
+ * Copyright (C) 2014-2020 Neil Brown <neil@brown.name>
  *
  *
  *    This program is free software; you can redistribute it and/or modify
@@ -19,7 +20,7 @@
  *    along with this program.
  *
  *    Author: Neil Brown
- *    Email: <neilb@suse.de>
+ *    Email: <neil@brown.name>
  */
 
 #include "wiggle.h"
@@ -90,9 +91,9 @@ static int is_cutpoint(struct merge m,
 }
 
 int wiggle_isolate_conflicts(struct file af, struct file bf, struct file cf,
-                     struct csl *csl1, struct csl *csl2, int words,
-                     struct merge *m, int show_wiggles,
-                     int *wigglesp)
+                            struct csl *csl1, struct csl *csl2, int words,
+                            struct merge *m, int show_wiggles,
+                            int *wigglesp)
 {
        /* A Conflict indicates that something is definitely wrong
         * and so we need to be a bit suspicious of nearby apparent matches.
@@ -427,8 +428,8 @@ int wiggle_isolate_conflicts(struct file af, struct file bf, struct file cf,
 }
 
 struct ci wiggle_make_merger(struct file af, struct file bf, struct file cf,
-                     struct csl *csl1, struct csl *csl2, int words,
-                     int ignore_already, int show_wiggles)
+                            struct csl *csl1, struct csl *csl2, int words,
+                            int ignore_already, int show_wiggles)
 {
        /* find the wiggles and conflicts between csl1 and csl2
         */
@@ -613,7 +614,7 @@ struct ci wiggle_make_merger(struct file af, struct file bf, struct file cf,
                        rv.merger[i].type = Conflict;
        }
        rv.conflicts = wiggle_isolate_conflicts(af, bf, cf, csl1, csl2, words,
-                                        rv.merger, show_wiggles, &rv.wiggles);
+                                               rv.merger, show_wiggles, &rv.wiggles);
        return rv;
 }
 
@@ -638,8 +639,8 @@ static const char *conflict_types[] = {
        "", " border"," conflict"," wiggle" };
 
 int wiggle_print_merge(FILE *out, struct file *a, struct file *b, struct file *c,
-               int words, struct merge *merger,
-               struct merge *mpos, int streampos, int offsetpos)
+                      int words, struct merge *merger,
+                      struct merge *mpos, int streampos, int offsetpos)
 {
        struct merge *m;
        int lineno = 1;
@@ -786,9 +787,9 @@ int wiggle_print_merge(FILE *out, struct file *a, struct file *b, struct file *c
                                                /* Nothing more to report */
                                                break;
                                        if (cm->in_conflict == 1 &&
-                                              (cm->type == Extraneous ||
-                                               cm->type == Unmatched ||
-                                               cm->type == Unchanged))
+                                           (cm->type == Extraneous ||
+                                            cm->type == Unmatched ||
+                                            cm->type == Unchanged))
                                                /* border between conflicts, but
                                                 * still nothing to report.
                                                 */