comparison tests/test-merge5 @ 4379:80c7fa620a4d

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 26 Apr 2007 18:41:18 -0500
parents fffc8a733bf9
children 6aa4a3fa4e60
comparison
equal deleted inserted replaced
4378:e33ad7cea15f 4379:80c7fa620a4d