equal
deleted
inserted
replaced
7 merge = internal:merge |
7 merge = internal:merge |
8 editor = emacs -q |
8 editor = emacs -q |
9 ignore = ~/.hgignore |
9 ignore = ~/.hgignore |
10 |
10 |
11 [defaults] |
11 [defaults] |
12 log = -v |
12 log = -v -f |
13 incoming = -v |
13 incoming = -v |
14 outgoing = -v |
14 outgoing = -v |
15 |
15 |
16 [merge-tools] |
16 [merge-tools] |
17 emacs.args = -q --eval "(ediff-merge-with-ancestor \"$local\" \"$other\" \"$base\" nil \"$output\")" |
17 emacs.args = -q --eval "(ediff-merge-with-ancestor \"$local\" \"$other\" \"$base\" nil \"$output\")" |