Mercurial > dotfiles
comparison .hgrc @ 87:b958738c16f3
Fix an oops in the .hgrc.
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Thu, 16 Apr 2009 14:56:15 -0500 |
parents | 68f53fa09e99 |
children | 9d09939f1100 |
comparison
equal
deleted
inserted
replaced
86:68f53fa09e99 | 87:b958738c16f3 |
---|---|
12 hgext.purge= | 12 hgext.purge= |
13 hgext.rebase= | 13 hgext.rebase= |
14 hgext.record= | 14 hgext.record= |
15 hgext.transplant= | 15 hgext.transplant= |
16 # hgext.zeroconf= | 16 # hgext.zeroconf= |
17 hgsubversion=/Stuff/hgsubversion | 17 hgsubversion= |
18 hggit= | 18 hggit= |
19 histedit= | 19 histedit= |
20 | |
21 [merge-tools] | |
22 filemerge.executable = opendiff-w | |
23 filemerge.args = $local $other -ancestor $base -merge $output | |
20 | 24 |
21 [alias] | 25 [alias] |
22 ll=log --graph -l 6 | 26 ll=log --graph -l 6 |
23 | 27 |
24 [ui] | 28 [ui] |