diff options
| author | Lennart Poettering <lennart@poettering.net> | 2003-11-30 14:27:42 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2003-11-30 14:27:42 +0000 |
| commit | b6abf79d60722dbee89e6270435d0b11c0dffa91 (patch) | |
| tree | d40783bd9c86b989e9f2ddb4a0dc63f9592d74f0 /src/merge.h | |
| parent | c0d1779760fd10d14344fa1ed70b91bdf50272c1 (diff) | |
relase 0.3
--copy-always
--sort
bi-directory merges
--check-md
git-svn-id: file:///home/lennart/svn/public/syrep/trunk@43 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 02c1a9e..33acf11 100644 --- a/src/merge.h +++ b/src/merge.h @@ -23,7 +23,7 @@ #include "context.h" -int merge(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, const char* sroot); int empty_trash(const char *trash); #endif |