# HG changeset patch # User Augie Fackler # Date 1267932920 21600 # Node ID 74e330570ecb9405c680a0a0eea82fd3c6616c72 # Parent 74bc570bff86f6976809d21d640f11d11af3e31f hg: always enable remotebranches extension diff --git a/.hgrc b/.hgrc --- a/.hgrc +++ b/.hgrc @@ -17,6 +17,7 @@ hgext.progress= hggit= hgsubversion= hg_histedit= +hg_remotebranches= [merge-tools] filemerge.executable = opendiff-w