comparison tests/test-merge4.out @ 3431:145a8fde69e6

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