Mercurial > ec-dotfiles
comparison rc/hgrc @ 473:1ed4d4c449a6
Add global hgignore.
author | edogawaconan <me@myconan.net> |
---|---|
date | Sun, 14 Jul 2013 02:05:55 +0900 |
parents | f8397bdc0cbc |
children | 347e30690879 ec49852111cb |
comparison
equal
deleted
inserted
replaced
472:4322b0a8a695 | 473:1ed4d4c449a6 |
---|---|
1 [ui] | 1 [ui] |
2 username = edogawaconan <me@myconan.net> | 2 username = edogawaconan <me@myconan.net> |
3 merge = vimdiff | 3 merge = vimdiff |
4 verbose = true | 4 verbose = true |
5 style = compact | 5 style = compact |
6 ignore = ~/.hgignore_global | |
7 ignore.local = ~/.hgignore_global.local | |
6 | 8 |
7 [merge-tools] | 9 [merge-tools] |
8 vimdiff.executable = vim | 10 vimdiff.executable = vim |
9 vimdiff.args = -d $base $local $output $other +close +close | 11 vimdiff.args = -d $base $local $output $other +close +close |
10 | 12 |