[Pkg-ocaml-maint-commits] [SCM] unison packaging branch, master, updated. debian/2.32.52-1

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 2efc06cf97da247c015f675b02bbd5830eb91c9a
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Sat Feb 27 16:26:42 2010 +0100

    Workgin git-merge.ml script.

diff --git a/debian/git-merge.ml b/debian/git-merge.ml
index f6fdad5..ede5e16 100755
--- a/debian/git-merge.ml
+++ b/debian/git-merge.ml
@@ -13,7 +13,7 @@ let save fn =
     fn, tmp
 
 let restore ?(ext="") (fn, tmp) =
-  mv [tmp] (fn^ext)
+  mv tmp (fn^ext)
 
 let fns = 
   [
@@ -42,4 +42,4 @@ let () =
             List.iter (restore ~ext:".old") baks
 
   with e ->
-    rm ~force:true (List.map snd baks)
+    rm (List.map snd baks)

-- 
unison packaging