X-Git-Url: https://deadsoftware.ru/gitweb?p=bbdiff.git;a=blobdiff_plain;f=README;h=bf0fb5ab025f9bc4198e887acac9e44fae5e8371;hp=c5b7788ac793c95fe4f4dfc17e3286905b7655d9;hb=bc31680f7b5d93af971a2caaaad3077c0e8b86a4;hpb=8de02e8e7565ebf0dd67802843cc35af7df7af6f

diff --git a/README b/README
index c5b7788..bf0fb5a 100644
--- a/README
+++ b/README
@@ -41,13 +41,13 @@ Integration with git
 2. Create script odctool-gitdiff:
 
 	#! /bin/sh
-	odctool diff -x -X -C -p "$1" "$2" "$5"
+	odctool diff -x -X -E -C -p "$1" "$2" "$5"
 
 3. Add to .git/config:
 
 	[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