X-Git-Url: http://deadsoftware.ru/gitweb?p=bbdiff.git;a=blobdiff_plain;f=README;h=286a5acf3fc19ed4e3465f6a2315d47096638158;hp=c5b7788ac793c95fe4f4dfc17e3286905b7655d9;hb=a26d079c14e616a0434fb9498fbfb29beb2e9594;hpb=8de02e8e7565ebf0dd67802843cc35af7df7af6f

diff --git a/README b/README
index c5b7788..286a5ac 100644
--- 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