comparison tests/test-excessive-merge.out @ 3097:1b738357bba9

merge: fold umap and added into m1 manifest
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 21:02:25 -0500
parents b2ae81a7df29
children 8feb33c2d153
comparison
equal deleted inserted replaced
3096:54d85098fb82 3097:1b738357bba9