diff tests/test-simplemerge-cmd @ 6269:ffdf70e74623

merge: privatize some functions, unnest some others
author Matt Mackall <mpm@selenic.com>
date Sat, 15 Mar 2008 10:02:31 -0500
parents c6413f8f2f8e
children e1f4343db740
line wrap: on
line diff