| changeset 198 | 6fd142910e94 |
| parent 158 | 1df00afab192 |
| child 229 | c351b7891093 |
| 196:212adbf0e988 | 198:6fd142910e94 |
|---|---|
10 |
10 |
11 [defaults] |
11 [defaults] |
12 log = -v -f |
12 log = -v -f |
13 incoming = -v |
13 incoming = -v |
14 outgoing = -v |
14 outgoing = -v |
15 diff = --git |
|
15 |
16 |
16 [merge-tools] |
17 [merge-tools] |
17 emacs.args = -q --eval "(ediff-merge-with-ancestor \"$local\" \"$other\" \"$base\" nil \"$output\")" |
18 emacs.args = -q --eval "(ediff-merge-with-ancestor \"$local\" \"$other\" \"$base\" nil \"$output\")" |
18 |
19 |
19 [web] |
20 [web] |