comparison tests/test-merge-commit.out @ 4879:da8640113b5a

Merge with -stable
author Matt Mackall <mpm@selenic.com>
date Sat, 14 Jul 2007 13:34:40 -0500
parents e7282dede8cd
children 17ed9b9a0d03
comparison
equal deleted inserted replaced
4876:001e8a745834 4879:da8640113b5a