comparison .hgrc @ 246:74e330570ecb

hg: always enable remotebranches extension
author Augie Fackler <durin42@gmail.com>
date Sat, 06 Mar 2010 21:35:20 -0600
parents 74bc570bff86
children 4313117237ed
comparison
equal deleted inserted replaced
245:74bc570bff86 246:74e330570ecb
15 hgext.schemes= 15 hgext.schemes=
16 hgext.progress= 16 hgext.progress=
17 hggit= 17 hggit=
18 hgsubversion= 18 hgsubversion=
19 hg_histedit= 19 hg_histedit=
20 hg_remotebranches=
20 21
21 [merge-tools] 22 [merge-tools]
22 filemerge.executable = opendiff-w 23 filemerge.executable = opendiff-w
23 filemerge.args = $local $other -ancestor $base -merge $output 24 filemerge.args = $local $other -ancestor $base -merge $output
24 25