view tests/test-merge3.out @ 3108:67874ebbb7dd

merge: linear_path -> linear
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 16:50:17 -0500
parents 91c56c427171
children
line wrap: on
line source

removing b
nothing changed