diff mercurial/config.py @ 9783:ee00ef6f9be7

submerge: properly deal with overwrites also pull .hgsubstate check out of inner loop
author Matt Mackall <mpm@selenic.com>
date Sun, 08 Nov 2009 10:29:52 -0600
parents bccf780f78ed
children 7cdd2a7db2c2
line wrap: on
line diff