diff tests/test-merge5.out @ 2820:0bf22c109cc3

Factor doupdate into _lookup + hg.update
author Matt Mackall <mpm@selenic.com>
date Mon, 07 Aug 2006 20:54:03 -0500
parents b2ae81a7df29
children 49988d9f0758
line wrap: on
line diff