| changeset 652 | 4371bfe8ea96 |
| parent 626 | ec0fb611d885 |
| child 684 | 95b15ebd8e1e |
| 651:649cbbab7ded | 652:4371bfe8ea96 |
|---|---|
12 |
12 |
13 [defaults] |
13 [defaults] |
14 log = -v |
14 log = -v |
15 incoming = -v |
15 incoming = -v |
16 outgoing = -v |
16 outgoing = -v |
17 diff = --git |
17 |
18 [diff] |
|
19 git = 1 |
|
20 unified = 5 |
|
21 showfunc = 1 |
|
18 |
22 |
19 [merge-tools] |
23 [merge-tools] |
20 emacs.args = -q --eval "(ediff-merge-with-ancestor \"$local\" \"$other\" \"$base\" nil \"$output\")" |
24 emacs.args = -q --eval "(ediff-merge-with-ancestor \"$local\" \"$other\" \"$base\" nil \"$output\")" |
21 |
25 |
22 [web] |
26 [web] |