comparison tests/test-merge7 @ 3001:ad558f297eb1

merge: simplify some update logic
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 16:47:27 -0500
parents e506c14382fd
children c0b449154a90
comparison
equal deleted inserted replaced
3000:33dcf03ef45f 3001:ad558f297eb1