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

diff --git a/README b/README
index bbee7ba..bf0fb5a 100644
--- a/README
+++ b/README
@@ -41,13 +41,13 @@ Integration with git
 2. Create script odctool-gitdiff:
 
 	#! /bin/sh
-	odctool diff -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
@@ -79,14 +79,14 @@ Integration with ranger
 
 			# BlackBox Compound Document
 			odc)
-				odctool -C cat "${FILE_PATH}" && exit 5
+				odctool -C -X cat "${FILE_PATH}" && exit 5
 				exit 1;;
 		esac
 	}
 
 2. To open/read documents add to $HOME/.config/ranger/rifle.conf:
 
-	ext odc, has odctool, terminal, file = odctool -C cat "$1" | less --tabs=2 -S
+	ext odc, has odctool, terminal, file = odctool -C -X cat "$1" | less --tabs=2 -S
 
 
 Current state