diff tests/test-excessive-merge @ 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 e506c14382fd
children ad3d5b4367cb
line wrap: on
line diff