Merge branch 'maint'

[git.git] / combine-diff.c

diff --git a/combine-diff.c b/combine-diff.c
index 0b071b6e256fa655b51f9e484f0633a7f055dd25..d210656861dcd6568e1228f39dff042ab374a584 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -534,7 +534,6 @@ static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent,
                return; /* result deleted */
 
        while (1) {
-               struct sline *sl = &sline[lno];
                unsigned long hunk_end;
                unsigned long rlines;
                const char *hunk_comment = NULL;
@@ -600,7 +599,7 @@ static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent,
                        struct lline *ll;
                        int j;
                        unsigned long p_mask;
-                       sl = &sline[lno++];
+                       struct sline *sl = &sline[lno++];
                        ll = (sl->flag & no_pre_delete) ? NULL : sl->lost_head;
                        while (ll) {
                                fputs(c_old, stdout);