Mercurial > hg
comparison tests/test-merge1.out @ 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 | d8143769e1d4 |
children |
comparison
equal
deleted
inserted
replaced
9782:c1c40511c276 | 9783:ee00ef6f9be7 |
---|