Show More
| @@ -1,7 +1,7 b'' | |||
|
|
1 | 1 | # Some default global settings for common merge tools |
|
|
2 | 2 | |
|
|
3 | 3 | [merge-tools] |
|
|
4 | kdiff3.args=--auto -L1 base --L2 local --L3 other $base $local $other -o $output | |
|
|
4 | kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output | |
|
|
5 | 5 | kdiff3.regkey=Software\KDiff3 |
|
|
6 | 6 | kdiff3.regappend=\kdiff3.exe |
|
|
7 | 7 | kdiff3.fixeol=True |
General Comments 0
You need to be logged in to leave comments.
Login now