diff tests/test-pull-pull-corruption2.out @ 3200:e67c22bc8bba

merge: use repo.parents and parent contexts in update
author Matt Mackall <mpm@selenic.com>
date Fri, 29 Sep 2006 16:39:38 -0500
parents 57729c56a23c
children
line wrap: on
line diff