Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge6.out @ 3108:3bd05ad67f45
merge: pull manifest checks and updates into separate functions
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 17 Sep 2006 16:47:33 -0500 |
parents | b2ae81a7df29 |
children | 8feb33c2d153 |