diff tests/test-merge-revert2.out @ 3001:ad558f297eb1

merge: simplify some update logic
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 16:47:27 -0500
parents b2ae81a7df29
children ad6f34c83c3d
line wrap: on
line diff