diff options
| author | Lennart Poettering <lennart@poettering.net> | 2003-08-28 00:26:05 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2003-08-28 00:26:05 +0000 |
| commit | 98f36517251b5bccdb80d90d698c173c18ee4a29 (patch) | |
| tree | bdcbb19a48d0f4fb06c96fb7376cf5b549539e68 /src/merge.h | |
| parent | 7ea422bfaf6c9d22346cd415fd6b97712322fd81 (diff) | |
implemented merging an patch making
git-svn-id: file:///home/lennart/svn/public/syrep/trunk@9 07ea20a6-d2c5-0310-9e02-9ef735347d72
Diffstat (limited to 'src/merge.h')
| -rw-r--r-- | src/merge.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge.h b/src/merge.h index 2b88712..17d3fc0 100644 --- a/src/merge.h +++ b/src/merge.h @@ -3,6 +3,6 @@ #include "context.h" -int merge_snapshot(struct syrep_db_context *c1, struct syrep_db_context *c2, const char* root); +int merge(struct syrep_db_context *c1, struct syrep_db_context *c2, const char* root); #endif |