comparison tests/test-merge-revert.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 b2ae81a7df29
children 966632304dde
comparison
equal deleted inserted replaced
3199:ebdb3f616bc0 3200:e67c22bc8bba