| changeset 145 | 90f8794f2290 |
| parent 132 | a2d359154fb7 |
| child 151 | 03f294e76a50 |
| 144:27f383858159 | 145:90f8794f2290 |
|---|---|
10 |
10 |
11 [defaults] |
11 [defaults] |
12 log = -v |
12 log = -v |
13 incoming = -v |
13 incoming = -v |
14 outgoing = -v |
14 outgoing = -v |
15 |
|
16 [merge-tools] |
|
17 emacs.args = -q --eval "(ediff-merge-with-ancestor \"$local\" \"$other\" \"$base\" nil \"$output\")" |
|
15 |
18 |
16 [web] |
19 [web] |
17 encoding = utf-8 |
20 encoding = utf-8 |
18 |
21 |
19 [extensions] |
22 [extensions] |