Commits

Paul McLanahan committed 0718130

Added kdiff3 as an external diff and merge tool

Comments (0)

Files changed (1)

 transplant =
 record =
 pager =
+extdiff =
+
+[extdiff]
+cmd.kdiff3 =
+
+[merge-tools]
+kdiff3.args=--L1 Base --L2 Local --L3 Other $base $local $other -o $output
 
 [pager]
 pager = LESS="-FSRXi" less