comparison tests/test-merge-default @ 5046:bf444a9a9c23

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 01 Aug 2007 14:03:48 -0500
parents 013921c753bd
children 9cd6578750b9
comparison
equal deleted inserted replaced
5041:49059086c634 5046:bf444a9a9c23