comparison tests/test-merge1.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 a31557193f3c
comparison
equal deleted inserted replaced
2819:90a4181ca9ed 2820:0bf22c109cc3