Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge6 @ 3248:7a0d70b69d74
merge: reorder dirstate update slightly for correctness
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 04 Oct 2006 14:09:26 -0500 |
parents | e506c14382fd |
children | ad3d5b4367cb |