diff hgmerge @ 3108:67874ebbb7dd

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