diff options
Diffstat (limited to 'src/files.mli')
| -rw-r--r-- | src/files.mli | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/files.mli b/src/files.mli index b75c724..e3ba168 100644 --- a/src/files.mli +++ b/src/files.mli @@ -68,11 +68,12 @@ val ls : System.fspath -> string -> string list val merge : Common.root (* first root *) + -> Path.t (* path to merge *) + -> Common.updateItem (* differences from the archive *) -> Common.root (* second root *) -> Path.t (* path to merge *) - -> Uutil.File.t (* id for showing progress of transfer *) -> Common.updateItem (* differences from the archive *) - -> Common.updateItem (* ... *) + -> Uutil.File.t (* id for showing progress of transfer *) -> (string->string->bool) (* function to display the (title and) result and ask user for confirmation (when -batch is true, the function should not ask any |