From: DeaDDooMER <deaddoomer@deadsoftware.ru>
Date: Tue, 19 Mar 2019 18:04:20 +0000 (+0300)
Subject: aliases can be applied for any file
X-Git-Url: https://deadsoftware.ru/gitweb?p=bbdiff.git;a=commitdiff_plain;h=a26d079c14e616a0434fb9498fbfb29beb2e9594

aliases can be applied for any file
---

diff --git a/Diff/Mod/Main.odc b/Diff/Mod/Main.odc
index 33bfec8..6553551 100644
Binary files a/Diff/Mod/Main.odc and b/Diff/Mod/Main.odc differ
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