comparison tests/test-committer.out @ 3167: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 f1085d34d20d
children 8b55c0ba8048
comparison
equal deleted inserted replaced
3166:ebdb3f616bc0 3167:e67c22bc8bba