OLD | NEW |
---|---|
(Empty) | |
1 [paths] | |
2 default = https://code.google.com/p/nacl-llvm-branches.upstream | |
3 | |
4 [web] | |
5 push_ssl = false | |
6 allow_push = * | |
7 | |
8 [merge-tools] | |
9 kdiff3.executable = /usr/bin/kdiff3 | |
10 kdiff3.args = --auto --base $base $local $other -o $output | |
11 kdiff3.priority = 0 | |
OLD | NEW |