diff mercurial/cmdutil.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 2c24471d478c
children 2c2f7593ffc4
line wrap: on
line diff