diff tests/test-push-warn.out @ 3109:67874ebbb7dd

merge: linear_path -> linear
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 16:50:17 -0500
parents 092039246d73
children 975c2469c316
line wrap: on
line diff