comparison: .hgrc
.hgrc
- changeset 219
- 9ab4c7db4b3a
- parent 209
- 557d2468f900
- child 222
- 1dc0597fe712
equal
deleted
inserted
replaced
| 218:388973873b1b | 219:9ab4c7db4b3a |
|---|---|
| 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 [committemplate] | |
| 31 changeset = {desc}\n\n | |
| 32 HG: {extramsg} | |
| 33 HG: user: {author}\n{ifeq(p2rev, "-1", "", | |
| 34 "HG: branch merge\n") | |
| 35 }HG: branch '{branch}'\n{if(currentbookmark, | |
| 36 "HG: bookmark '{currentbookmark}'\n") }{subrepos % | |
| 37 "HG: subrepo {subrepo}\n" } | |
| 38 {splitlines(diff()) % 'HG: {line}\n'} | |
| 30 | 39 |
| 31 %include ~/.hgrc.local | 40 %include ~/.hgrc.local |
