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

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