diff tests/test-merge-default.out @ 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 013921c753bd
children 9cd6578750b9
line wrap: on
line diff