Changeset 102c81a7dd3c…
Parent 5aec53c88fa3…
by Benjamin Pollack
Changes to one file · Browse files at 102c81a7dd3c Showing diff from parent 5aec53c88fa3 Diff from another changeset...
@@ -52,6 +52,7 @@ bqb = https://bqb.kilnhg.com/Code
[merge-tools]
+kdiff3.executable = /Applications/kdiff3.app/Contents/MacOS/kdiff3
kdiff3.args = --L1 base --L2 local --L3 other $base $local $other -o $output
kdiff3.gui = True
|
Loading...