diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-21 05:03:04 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-21 05:03:04 +0000 |
| commit | b88736462df2c86a83f01dcc260b5463205819d2 (patch) | |
| tree | b1a9a5a5392a52ec4e5f60fb4b45083cf7fd65b0 /deps/xdiff/xmerge.c | |
| parent | Adding upstream version 1.7.2+ds. (diff) | |
| download | libgit2-b88736462df2c86a83f01dcc260b5463205819d2.tar.xz libgit2-b88736462df2c86a83f01dcc260b5463205819d2.zip | |
Adding upstream version 1.8.1+ds.upstream/1.8.1+dsupstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | deps/xdiff/xmerge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/deps/xdiff/xmerge.c b/deps/xdiff/xmerge.c index af40c88..6ebf73a 100644 --- a/deps/xdiff/xmerge.c +++ b/deps/xdiff/xmerge.c @@ -88,7 +88,7 @@ static int xdl_cleanup_merge(xdmerge_t *c) if (c->mode == 0) count++; next_c = c->next; - free(c); + xdl_free(c); } return count; } @@ -456,7 +456,7 @@ static void xdl_merge_two_conflicts(xdmerge_t *m) m->chg1 = next_m->i1 + next_m->chg1 - m->i1; m->chg2 = next_m->i2 + next_m->chg2 - m->i2; m->next = next_m->next; - free(next_m); + xdl_free(next_m); } /* |