aliases can be applied for any file

diff --git a/Diff/Mod/Main.odc b/Diff/Mod/Main.odc
index 33bfec8ef3ef54b81bdb42b728cac2042ebc6545..6553551219e82cd1bdfe337c3a665876856ed8fb 100644 (file)
Binary files a/Diff/Mod/Main.odc and b/Diff/Mod/Main.odc differ

diff --git a/README b/README
index c5b7788ac793c95fe4f4dfc17e3286905b7655d9..286a5acf3fc19ed4e3465f6a2315d47096638158 100644 (file)
--- a/README
+++ b/README
@@ -47,7 +47,7 @@ Integration with git
 
        [merge "odctool"]
                name = BlackBox Compound Document merge driver
-               driver = odctool merge -p %P -o %A %A %O %B
+               driver = odctool merge -o %A -p HEAD %A -p PARENT %O -p BRANCH %B
        [diff "odctool"]
                name = BlackBox Compound Document diff driver
                command = odctool-gitdiff