diff tests/test-merge1 @ 4207:7e1c8a565a4f

Move branch read/write to dirstate where it belongs
author Matt Mackall <mpm@selenic.com>
date Tue, 13 Mar 2007 18:50:02 -0500
parents 9dcf9d45cab8
children ccfe423d3d0a
line wrap: on
line diff