comparison tests/test-merge-default.out @ 3416:145a8fde69e6

Update branch on checkout/update
author Matt Mackall <mpm@selenic.com>
date Tue, 17 Oct 2006 18:30:20 -0500
parents 013921c753bd
children 9cd6578750b9
comparison
equal deleted inserted replaced
3415:9a6491770b04 3416:145a8fde69e6