comparison: .hgrc
.hgrc
- changeset 222
- 1dc0597fe712
- parent 219
- 9ab4c7db4b3a
- child 254
- bb7fdde50da2
equal
deleted
inserted
replaced
| 221:607a4c596cdb | 222:1dc0597fe712 |
|---|---|
| 25 [merge-tools] | 25 [merge-tools] |
| 26 vimdiff.executable = vim | 26 vimdiff.executable = vim |
| 27 vimdiff.args = -d $base $local $output $other +close +close | 27 vimdiff.args = -d $base $local $output $other +close +close |
| 28 vimdiff.check = changed, conflicts | 28 vimdiff.check = changed, conflicts |
| 29 | 29 |
| 30 [diff] | |
| 31 git = true | |
| 32 showfunc = true | |
| 33 | |
| 30 [committemplate] | 34 [committemplate] |
| 31 changeset = {desc}\n\n | 35 changeset = {desc}\n\n |
| 32 HG: {extramsg} | 36 HG: {extramsg} |
| 33 HG: user: {author}\n{ifeq(p2rev, "-1", "", | 37 HG: user: {author}\n{ifeq(p2rev, "-1", "", |
| 34 "HG: branch merge\n") | 38 "HG: branch merge\n") |
