diff tests/test-branch.out @ 3120:1c1e59aac82a

merge: simplify local created logic
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 21:11:26 -0500
parents 547d1a4aa105
children b28d3e0f9a8c
line wrap: on
line diff