view mercurial/__init__.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 9117c6561b0b
children 4374d819ccd5
line wrap: on
line source