Mercurial > hg
diff mercurial/node.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 | 8b2cd04a6e97 |
children | 25e572394f5c |