diff tests/test-branch.out @ 3112:5cc62d99b785

merge: move apply and dirstate code into separate functions
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 17:39:19 -0500
parents 547d1a4aa105
children b28d3e0f9a8c
line wrap: on
line diff