From b6abf79d60722dbee89e6270435d0b11c0dffa91 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Sun, 30 Nov 2003 14:27:42 +0000
Subject: 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
---
 src/merge.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/merge.h')

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
-- 
cgit