diff tests/test-excessive-merge.out @ 3107:4ec28446fca8

merge: remove now unused umap dict
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 16:13:34 -0500
parents b2ae81a7df29
children 8feb33c2d153
line wrap: on
line diff