comparison tests/test-excessive-merge.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
comparison
equal deleted inserted replaced
3107:4ec28446fca8 3108:3bd05ad67f45